From 9628c86a6607380dbc7c0191a6055e07c6334657 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Mon, 01 Jun 2020 16:11:36 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/huge/frontEnd/hugeOA
---
src/components/oa/merits/meritsDetail/index.jsx | 2 +-
src/api/httpurl.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/api/httpurl.js b/src/api/httpurl.js
index 6c15c9e..640d96e 100644
--- a/src/api/httpurl.js
+++ b/src/api/httpurl.js
@@ -1,6 +1,6 @@
//内网测试地址
-let StagingUrl = 'http://192.168.3.12:9072';
-// let StagingUrl = "http://120.79.193.119:9072";
+// let StagingUrl = 'http://192.168.3.12:9072';
+let StagingUrl = "http://120.79.193.119:9072";
// let StagingUrl = "http://120.79.193.119:9075";
//mock地址
diff --git a/src/components/oa/merits/meritsDetail/index.jsx b/src/components/oa/merits/meritsDetail/index.jsx
index ce9d01d..a8eab23 100644
--- a/src/components/oa/merits/meritsDetail/index.jsx
+++ b/src/components/oa/merits/meritsDetail/index.jsx
@@ -175,7 +175,7 @@
url: `api/merits/assess/findMeritsDetail`,
formData: {
...formData,
- userId: this.props.match.params.userId || JSON.parse(window.localStorage.getItem('loginUser'))
+ userId: this.props.match.params.userId || JSON.parse(window.localStorage.getItem('loginUser')).userId
},
key: formData.__key,
columns: this.renderColumns(),
--
Gitblit v1.8.0