From 36ce94154005a02fcff8ad1180a9112b2a8d38d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Fri, 28 Nov 2025 16:11:58 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=AD=BE=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomPages/FO/FO041ShowPrint.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/CustomPages/FO/FO041ShowPrint.js b/src/components/CustomPages/FO/FO041ShowPrint.js index d779ee9..aabce8e 100644 --- a/src/components/CustomPages/FO/FO041ShowPrint.js +++ b/src/components/CustomPages/FO/FO041ShowPrint.js @@ -146,9 +146,9 @@ class FO041ShowPrint extends React.Component { { - data.Nav_Users && data.Nav_Users.map((item, i) => { - if (item.DEAL_STATUS == 1) { - showUserSign(item.Nav_User, config.picServerHost) + data.Nav_PreUsers && data.Nav_PreUsers.map((item, i) => { + if (item.PRE_USER_DEAL_STATUS == 1) { + showUserSign(item.Nav_PreUser, config.picServerHost) } }) From 1660baab3fbae49b12bac729aba09ab0719aa468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Fri, 28 Nov 2025 17:55:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=AD=BE=E5=90=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomPages/FO/FO041ShowPrint.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/CustomPages/FO/FO041ShowPrint.js b/src/components/CustomPages/FO/FO041ShowPrint.js index aabce8e..5f59a4b 100644 --- a/src/components/CustomPages/FO/FO041ShowPrint.js +++ b/src/components/CustomPages/FO/FO041ShowPrint.js @@ -146,9 +146,9 @@ class FO041ShowPrint extends React.Component { { - data.Nav_PreUsers && data.Nav_PreUsers.map((item, i) => { - if (item.PRE_USER_DEAL_STATUS == 1) { - showUserSign(item.Nav_PreUser, config.picServerHost) + data.Nav_Users && data.Nav_Users.map((item, i) => { + if (item.DEAL_STATUS == 1) { + return {item.Nav_User?.NAME} } }) @@ -157,7 +157,7 @@ class FO041ShowPrint extends React.Component { { data.Nav_AfterUsers && data.Nav_AfterUsers.map((item, i) => { if (item.AFTER_USER_DEAL_STATUS == 1) { - showUserSign(item.Nav_AfterUser, config.picServerHost) + return {item.Nav_AfterUser?.NAME} } }) } From cd51beca52cb9ce678e783308c283b0eabf6f33d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Sat, 29 Nov 2025 15:56:41 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=AD=BE=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomPages/FO/FO035ShowPrint.js | 10 +++++----- src/components/CustomPages/FO/FO037ShowPrint.js | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/components/CustomPages/FO/FO035ShowPrint.js b/src/components/CustomPages/FO/FO035ShowPrint.js index 1b6d212..927031b 100644 --- a/src/components/CustomPages/FO/FO035ShowPrint.js +++ b/src/components/CustomPages/FO/FO035ShowPrint.js @@ -137,11 +137,11 @@ class FO035ShowPrint extends React.Component { { data.Nav_Person && data.Nav_Person.map((item, i) => { if (item.DEAL_STATUS == 1) { - showUserSign(item.Nav_User, config.picServerHost) - // if (item.Nav_User != null && item.Nav_User.FILE_PATH != null) - // return {item.Nav_User?.NAME} - // else - // return + // showUserSign(item.Nav_User, config.picServerHost) + if (item.Nav_User != null && item.Nav_User.FILE_PATH != null) + return {item.Nav_User?.NAME} + else + return } }) } diff --git a/src/components/CustomPages/FO/FO037ShowPrint.js b/src/components/CustomPages/FO/FO037ShowPrint.js index 3873198..c09e93b 100644 --- a/src/components/CustomPages/FO/FO037ShowPrint.js +++ b/src/components/CustomPages/FO/FO037ShowPrint.js @@ -138,11 +138,11 @@ class FO037ShowPrint extends React.Component { { data.Nav_Person && data.Nav_Person.map((item, i) => { if (item.DEAL_STATUS == 1) { - showUserSign(item.Nav_User, config.picServerHost) - // if (item.Nav_User != null && item.Nav_User.FILE_PATH != null) - // return {item.Nav_User?.NAME} - // else - // return + // showUserSign(item.Nav_User, config.picServerHost) + if (item.Nav_User != null && item.Nav_User.FILE_PATH != null) + return {item.Nav_User?.NAME} + else + return } }) } From 23a5083404e7766257f07295391f03b4161f2dd5 Mon Sep 17 00:00:00 2001 From: ccy <55274652@qq.com> Date: Sat, 29 Nov 2025 16:48:28 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/models/login.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/models/login.js b/src/models/login.js index c16ab72..f97021e 100644 --- a/src/models/login.js +++ b/src/models/login.js @@ -252,6 +252,7 @@ export default { storage("lacal").setItem("loginUserVerify", { username, password }); // 登录凭证存入localStorage } storage("lacal").setItem("webOrgId", ret.User.ORG_ID); + storage("lacal").setItem("webUserInfo", ret.User); storage("lacal").setItem("DataRule", ret.DataRule || []); storage("lacal").setItem("OrgRule", ret.OrgRule || []); storage("lacal").setItem("departmentId", ret.User.DEPARTMENT_ID); @@ -342,10 +343,22 @@ export default { return ret; }, // 验证登录状态 - *checkLoginStatus({ onSuccess, onFail }, { select }) { + *checkLoginStatus({ onSuccess, onFail }, { select, put }) { const { OrgId } = yield select((state) => state.login); if (!OrgId) { - onFail instanceof Function && onFail(); + const webOrgId = storage("lacal").getItem("webOrgId").val || storage("lacal").getItem("Orgid").val; + const userInfo = storage("lacal").getItem("webUserInfo").val; + if (webOrgId) { + const payload = { OrgId: webOrgId }; + if (userInfo) { + payload.user = userInfo; + payload.userId = userInfo.ID; + } + yield put({ type: "save", payload }); + onSuccess instanceof Function && onSuccess(); + } else { + onFail instanceof Function && onFail(); + } } else { onSuccess instanceof Function && onSuccess(); }