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 } }) } diff --git a/src/components/CustomPages/FO/FO041ShowPrint.js b/src/components/CustomPages/FO/FO041ShowPrint.js index d779ee9..5f59a4b 100644 --- a/src/components/CustomPages/FO/FO041ShowPrint.js +++ b/src/components/CustomPages/FO/FO041ShowPrint.js @@ -148,7 +148,7 @@ 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) + 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} } }) } 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(); }