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(); }