feat:处理员工不存在的问题

29fec6f1 · zhangleyuan · 97052e86 · 29fec6f1 · 29fec6f1 · 29fec6f1
Commit 29fec6f1 authored Jun 22, 2021 by zhangleyuan
8 changed files
--- a/src/common/js/axios.ts
+++ b/src/common/js/axios.ts
@@ -2,7 +2,7 @@
 * @Author: 吴文洁
 * @Date: 2020-08-31 09:34:31
 * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-06-21 15:45:20
+ * @LastEditTime: 2021-06-21 17:21:17
 * @Description: 
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 */
@@ -88,10 +88,10 @@ class Axios {
        if (success || resultCode === 0) {
          return response;
        } else if (!options.reject) {
-          if(code === "NONE_STORE_USER"){
+          // if(code === "NONE_STORE_USER"){
-            window.RCHistory.replace('/login');
+          //   window.RCHistory.replace('/login');
-            return Promise.reject();
+          //   return Promise.reject();
-          }
+          // }
          message.error(ResMessage || resultMsg);
        }
        return Promise.reject(response.data);

--- a/src/common/js/user.ts
+++ b/src/common/js/user.ts
@@ -2,21 +2,22 @@
 * @Author: 吴文洁
 * @Date: 2020-08-31 09:34:25
 * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-05-12 17:27:08
+ * @LastEditTime: 2021-06-21 19:38:53
 * @Description:
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 */
 import Storage from './storage';
 import { PREFIX, USER_PREFIX } from '@/domains/basic-domain/constants';
+declare var window:any;
 class User {
  getStoreId() {
-    return Storage.get(`${PREFIX}_storeId`);
+    console.log('storeid',window.currentStoreUserInfo.storeId)
+    return window.currentStoreUserInfo.storeId || Storage.get(`${PREFIX}_storeId`);
  }
  getEnterpriseId() {
-    return Storage.get(`${PREFIX}_enterpriseId`);
+    return window.currentStoreUserInfo.enterpriseId || Storage.get(`${PREFIX}_enterpriseId`);
  }
  getStoreName() {
@@ -28,21 +29,23 @@ class User {
  }
  getStoreUserId() {
-    return Storage.get(`${PREFIX}_storeUserId`);
+    return window.currentStoreUserInfo.storeUserId || Storage.get(`${PREFIX}_storeUserId`);
  }
  getCustomerId() {
    return Storage.get(`${PREFIX}_customerId`);
  }
  getUserId() {
-    return Storage.get(`${PREFIX}_userId`);
+    return window.currentStoreUserInfo.userId || Storage.get(`${PREFIX}_userId`);
  }
  getUserRole() {
    return Storage.get(`${PREFIX}_userRole`);
  }
  getToken() {
-    return Storage.get(`${PREFIX}_token`);
+    return window.currentStoreUserInfo.token || Storage.get(`${PREFIX}_token`);
  }
  getIsAdmin() {

--- a/src/index.tsx
+++ b/src/index.tsx
 /*
 * @Author: 吴文洁
 * @Date: 2020-04-27 20:35:34
- * @LastEditors: wufan
+ * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-03-26 16:14:09
+ * @LastEditTime: 2021-06-22 10:04:27
 * @Description:
 */
@@ -23,7 +23,10 @@ import User from '@/common/js/user';
 import Service from "@/common/js/service";
 declare var getParameterByName: any;
+declare var window: any;
+if(!window.currentStoreUserInfo){
+  window.currentStoreUserInfo = {}
+}
 const history = createHashHistory();
@@ -65,6 +68,10 @@ if (getParameterByName('code') && isWeiXin()) {
    User.setUserId(res.result.loginInfo.userId);
    User.setToken(res.result.loginInfo.xmToken);
    User.setEnterpriseId(res.result.enterpriseId);
+    window.currentStoreUserInfo = {};
+    window.currentStoreUserInfo.userId = res.result.loginInfo.userId;
+    window.currentStoreUserInfo.token =res.result.loginInfo.xmToken;
+    window.currentStoreUserInfo.enterpriseId = res.result.enterpriseId;
    mount()
  })
 } else {

--- a/src/modules/root/App.tsx
+++ b/src/modules/root/App.tsx
@@ -2,7 +2,7 @@
 * @Author: 吴文洁
 * @Date: 2019-07-10 10:30:49
 * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-05-24 16:29:05
+ * @LastEditTime: 2021-06-21 20:09:58
 * @Description:
 */
 import React, { useContext, useEffect, useState } from 'react';
@@ -21,6 +21,7 @@ import Bus from '@/core/tbus';
 import { func } from 'prop-types';
 declare var window: any;
+// window.currentStoreUserInfo = {};
 const App: React.FC = (props: any) => {
  const [storeUserId, setStoreUserId] = useState('')
@@ -29,7 +30,7 @@ const App: React.FC = (props: any) => {
  const [menuType, setMenuType] = useState(true);
  const enterpriseId = User.getEnterpriseId();
  window.ctx = ctx;
  useEffect(() => {
    getStoreAndUserInfo();
@@ -60,24 +61,36 @@ const App: React.FC = (props: any) => {
  async function getStoreAndUserInfo() {
    await (enterpriseId ? getStoreInfo() : getStoreGroupAndStoreList());
  }
  function getStoreInfo() {
+    console.log("currentStoreUserInfo",window.currentStoreUserInfo);
    const params = {
      storeId: User.getStoreId(),
      userId: User.getUserId(),
    };
    Service.Hades('public/customerHades/getStoreAndUserMsg', params).then((res) => {
-      const { id, storeUserId, storeName, userRole, storeType } = res.result;
+      if(res.success){
-      User.setStoreId(id);
+        const { id, storeUserId, storeName, userRole, storeType } = res.result;
-      User.setStoreUserId(storeUserId);
+        User.setStoreId(id);
-      User.setStoreName(storeName);
+        User.setStoreUserId(storeUserId);
-      Bus.trigger('storeNameChange',storeName);
+        User.setStoreName(storeName);
-      User.setUserRole(userRole);
+        Bus.trigger('storeNameChange',storeName);
-      User.setStoreType(storeType);
+        User.setUserRole(userRole);
-      setStoreUserId(storeUserId)
+        User.setStoreType(storeType);
-      getUserPermission();
+        setCurrentStoreUserInfo(id,storeUserId)
+        setStoreUserId(storeUserId);
+        getUserPermission();
+      }
    })
  }
+  function setCurrentStoreUserInfo(storeId:any,storeUserId:any){
+    window.currentStoreUserInfo.storeId = storeId;
+    window.currentStoreUserInfo.storeUserId = storeUserId;
+    window.currentStoreUserInfo.userId = User.getUserId();
+    window.currentStoreUserInfo.token = User.getToken();
+    window.currentStoreUserInfo.enterpriseId = User.getEnterpriseId();
+  }
  function getStoreGroupAndStoreList() {
@@ -97,6 +110,7 @@ const App: React.FC = (props: any) => {
      Bus.trigger('storeNameChange', storeName);
      User.setUserRole(userRole);
      User.setStoreType(storeType);
+      setCurrentStoreUserInfo(id,storeUserId);
      ctx.dispatch(setStoreGroupList(storeGroupVOS))
      ctx.dispatch(setStoreList(storeVOS));
      setStoreUserId(storeUserId)

--- a/src/modules/root/CollegeManagePage.jsx
+++ b/src/modules/root/CollegeManagePage.jsx
@@ -179,7 +179,7 @@ export default class CollegeManagePage extends React.Component {
                      return null;
                    };
                    User.setStoreId(item.id);
-                    // User.setStoreUserId(item.storeUserId);
+                    window.currentStoreUserInfo.storeId = item.id;
                    window.RCHistory.push('/home')
                  }}
                >
@@ -197,7 +197,7 @@ export default class CollegeManagePage extends React.Component {
                          e.preventDefault();
                          e.stopPropagation();
                          User.setStoreId(item.id);
-                          // User.setStoreUserId(item.storeUserId);
+                          window.currentStoreUserInfo.storeId = item.id;
                          window.RCHistory.push('/college-info')
                        }}
                      >编辑</span>
@@ -252,7 +252,7 @@ export default class CollegeManagePage extends React.Component {
                      return null;
                    };
                    User.setStoreId(item.id);
-                    // User.setStoreUserId(item.storeUserId);
+                    window.currentStoreUserInfo.storeId = item.id;
                    window.RCHistory.push('/home')
                  }}
                >
@@ -270,7 +270,7 @@ export default class CollegeManagePage extends React.Component {
                          e.preventDefault();
                          e.stopPropagation();
                          User.setStoreId(item.id);
-                          // User.setStoreUserId(item.storeUserId);
+                          window.currentStoreUserInfo.storeId = item.id;
                          window.RCHistory.push('/college-info')
                        }}
                      >编辑</span>

--- a/src/modules/root/Header.jsx
+++ b/src/modules/root/Header.jsx
@@ -2,7 +2,7 @@
 * @Author: 吴文洁
 * @Date: 2019-09-10 18:26:03
 * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-05-27 19:44:42
+ * @LastEditTime: 2021-06-21 17:05:59
 * @Description:
 */
 import React, { useRef, useContext, useEffect, useState } from "react";
@@ -271,6 +271,7 @@ function Header(props) {
                    onChange={(e) => {
                      setStoreId(e.target.value)
                      User.setStoreId(e.target.value);
+                      window.currentStoreUserInfo.storeId = e.target.value;
                      window.RCHistory.push('/home');
                      window.location.reload();
                    }}

--- a/src/modules/root/Login.jsx
+++ b/src/modules/root/Login.jsx
@@ -54,6 +54,10 @@ function Login(props) {
      User.setUserId(res.result.loginInfo.userId)
      User.setToken(res.result.loginInfo.xmToken)
      User.setEnterpriseId(res.result.enterpriseId)
+      window.currentStoreUserInfo = {};
+      window.currentStoreUserInfo.userId = res.result.loginInfo.userId;
+      window.currentStoreUserInfo.token = res.result.loginInfo.xmToken;
+      window.currentStoreUserInfo.enterpriseId = res.result.enterpriseId;
      User.setIdentifier(res.result.identifier)
      window.RCHistory.push({
        pathname: `/switch-route`
@@ -140,6 +144,9 @@ function Login(props) {
      } else {
        User.setUserId(res.result.userId)
        User.setToken(res.result.xmToken)
+        window.currentStoreUserInfo = {};
+        window.currentStoreUserInfo.userId = res.result.userId;
+        window.currentStoreUserInfo.token =res.result.xmToken;
        window.RCHistory.push({
          pathname: `/switch-route`
        })

--- a/src/modules/root/WechatLogin.tsx
+++ b/src/modules/root/WechatLogin.tsx
@@ -6,7 +6,7 @@ import { PATH } from '@/domains/basic-domain/constants';
 import './WechatLogin.less'
 const Logo = require("@/common/images/logo.png")
 declare var location: any;
+declare var window: any;
 export default function WechatLogin(props: any) {
    const freshTime = 60;
@@ -78,6 +78,10 @@ export default function WechatLogin(props: any) {
                    User.setUserId(_res.result.loginInfo.userId);
                    User.setToken(_res.result.loginInfo.xmToken);
                    User.setEnterpriseId(_res.result.enterpriseId);
+                    window.currentStoreUserInfo = {};
+                    window.currentStoreUserInfo.userId = _res.result.loginInfo.userId;
+                    window.currentStoreUserInfo.token =_res.result.loginInfo.xmToken;
+                    window.currentStoreUserInfo.enterpriseId =_res.result.enterpriseId;
                    User.setIdentifier(_res.result.identifier)
                    window.RCHistory.push({
                        pathname: `/switch-route`,