Browse Source

修改费用报销导入 工时导入

yurk 2 năm trước cách đây
mục cha
commit
710766f2db

+ 4 - 2
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -2428,7 +2428,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         //获取全部子部门
         List<Department> allDeptList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", user.getCompanyId()));
         List<Integer> deptIds=new ArrayList<>();
-        List<User> userList;
+        List<User> userList=new ArrayList<>();
         //判断查看权限
         if(functionAllList.size()==0){
             deptIds=new ArrayList<>();
@@ -2443,7 +2443,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 }
             }
             userList = userMapper.selectList(new QueryWrapper<User>().in("department_id", deptIds));
-        }else userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", user.getCompanyId()));
+        }else {
+            userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", user.getCompanyId()));
+        }
         httpRespMsg.data=userList;
         return httpRespMsg;
     }