第三方接口修改

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/UserController.java

@@ -76,6 +76,11 @@ public class UserController {
         return userService.getSimpleActiveUserList(departmentId, request);
     }
 
+    @RequestMapping("/getUserListByRole")
+    public HttpRespMsg getUserListByRole(){
+        return userService.getUserListByRole(request);
+    }
+
     /**
      * 删除用户
      * userId 用户id

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Task.java

@@ -99,7 +99,7 @@ public class Task extends Model<Task> {
     /**
      * 截止时间
      */
-    @TableField(fill = FieldFill.UPDATE)
+    @TableField("endDate")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate endDate;
@@ -168,7 +168,7 @@ public class Task extends Model<Task> {
     /**
      * 完成日期
      */
-    @TableField(fill = FieldFill.UPDATE)
+    @TableField("startDate")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private LocalDate finishDate;

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/UserService.java

@@ -69,4 +69,6 @@ public interface UserService extends IService<User> {
     HttpRespMsg batchUpdateRole(String userIds, Integer roleId, HttpServletRequest request);
 
     HttpRespMsg getSimpleActiveUserList(Integer departmentId, HttpServletRequest request);
+
+    HttpRespMsg getUserListByRole(HttpServletRequest request);
 }

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

@@ -135,6 +135,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     private UserCustomMapper userCustomMapper;
     @Resource
     private ExpenseTypeService expenseTypeService;
+    @Resource
+    private DepartmentOtherManagerMapper departmentOtherManagerMapper;
     //登录网页端
     @Override
     public HttpRespMsg loginAdmin(String username, String password) {
@@ -1776,6 +1778,32 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         return msg;
     }
 
+    @Override
+    public HttpRespMsg getUserListByRole(HttpServletRequest request) {
+        HttpRespMsg httpRespMsg=new HttpRespMsg();
+        User user = userMapper.selectById(request.getHeader("token"));
+        List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("manager_id", user.getId()));
+        List<DepartmentOtherManager> otherManagers = departmentOtherManagerMapper.selectList(new QueryWrapper<DepartmentOtherManager>().eq("other_manager_id", user.getId()));
+        //获取全部子部门
+        List<Department> allDeptList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", user.getCompanyId()));
+        List<Integer> collect = departmentList.stream().distinct().map(Department::getDepartmentId).collect(Collectors.toList());
+        List<Integer> collect1 = otherManagers.stream().distinct().map(DepartmentOtherManager::getDepartmentId).collect(Collectors.toList());
+        List<Integer> deptIds=new ArrayList<>();
+        for (Integer departmentId : collect) {
+            List<Integer> ids = departmentService.getDeptIncludeSubDeptIds(departmentId, allDeptList);
+            deptIds.addAll(ids);
+        }
+        for (Integer departmentId : collect1) {
+            List<Integer> ids = departmentService.getDeptIncludeSubDeptIds(departmentId, allDeptList);
+            deptIds.addAll(ids);
+        }
+        if(deptIds!=null&&deptIds.size()>0){
+            List<User> userList = userMapper.selectList(new QueryWrapper<User>().in("department_id", deptIds));
+            httpRespMsg.data=userList;
+        }
+        return httpRespMsg;
+    }
+
 
     public boolean push(User user, String date) {
         //1，配置