1

src/pages/Workbench/Dashboard/index.jsx

@@ -88,9 +88,9 @@ const Dashboard = ({ dispatch, departments = [] }) => {
       current: 1,
       pageSize: 100
     })
-    if (code === consts.RET_CODE.SUCCESS) {
+    if (code === consts.RET_CODE.SUCCESS && canSetState) {
       // list存起来
-      canSetState && setState({ ...state, staffList: list })
+      setState({ ...state, staffList: list })
     }
     return list
   }
@@ -121,14 +121,14 @@ const Dashboard = ({ dispatch, departments = [] }) => {
       }
     } = await queryDashboard(payload)
     if (code === consts.RET_CODE.SUCCESS) {
-      let staffList
-      if (state.params.dataPermission === 'department' && currentUser) {
-        staffList = await queryStaffList(currentUser.departmentId)
+      const otherState = {}
+      if (!state.staffList.length && state.params.dataPermission === 'department' && currentUser) {
+        otherState.staffList = await queryStaffList(currentUser.departmentId, false)
       }
       if (state.immediate) {
         setState({
           ...state,
-          staffList,
+          ...otherState,
           loading: false,
           immediate: false,
           reminderData,
@@ -147,8 +147,8 @@ const Dashboard = ({ dispatch, departments = [] }) => {
       timer.current = setTimeout(() => {
         setState({
           ...state,
+          ...otherState,
           loading: false,
-          staffList,
           reminderData,
           leaderboard,
           productLeaderBoard,
@@ -250,8 +250,8 @@ const Dashboard = ({ dispatch, departments = [] }) => {
     }
   ]
 
-  const handleChangeGroupId = e =>
-    setState({ ...state, immediate: true, params: { ...state.params, businessGroupId: e } })
+  // const handleChangeGroupId = e =>
+  //   setState({ ...state, immediate: true, params: { ...state.params, businessGroupId: e } })
 
   // 处理权限Select下拉组件OnChange事件
   const handlePermChange = ({ staffIds = [], dataPermission }) => {