合并分支 'gwj' 到 'master'

notes-pas/src/main/java/com/zjty/tynotes/pas/config/handler/MyFailHandler.java

@@ -26,6 +26,6 @@ public class MyFailHandler implements AuthenticationFailureHandler {
         httpServletResponse.setStatus(200);
         httpServletResponse.setCharacterEncoding("utf-8");
         httpServletResponse.setContentType("application/json");
-        httpServletResponse.getWriter().println("{\"code\":401,\"msg\":\"用户登陆失败\"}");
+        httpServletResponse.getWriter().println("{\"code\":401,\"msg\":\"账户或密码错误\"}");
     }
 }

notes-weekly/src/main/java/com/zjty/tynotes/weekly/subject/service/impl/UserManageServiceImpl.java

@@ -357,7 +357,24 @@ public class UserManageServiceImpl implements UserManageService {
         PageResponse pageResponse = new PageResponse();
         List<User> users = null;
         if(addressRequest.getDeId()!=null){
-            users = pasUserDao.findAllByDepartmentIdsContains(addressRequest.getDeId());
+            String deId = addressRequest.getDeId();
+            List<String> deIds = new ArrayList<>();
+            getDepartmentList(deId,deIds);
+            List<String> userIds = new ArrayList<>();
+            if(deIds!=null){
+                deIds.forEach(s -> {
+                    List<User> userList = pasUserDao.findAllByDepartmentIdsContains(s);
+                    if(userList!=null){
+                        userList.forEach(user -> {
+                            if(!userIds.contains(user.getId())){
+                                userIds.add(user.getId());
+                            }
+                        });
+                    }
+                });
+            }
+            users = pasUserDao.findAllByIdIn(userIds);
+
         }else{
             users = pasUserDao.findAll();
         }
@@ -438,6 +455,23 @@ public class UserManageServiceImpl implements UserManageService {
         }
     }
 
+    /**
+     * 根据部门id递归获得部门列表
+     * @param departmentId
+     */
+    public void getDepartmentList(String departmentId,List<String> deIds) {
+        if(!deIds.contains(departmentId)){
+            deIds.add(departmentId);
+        }
+        List<Department> departmentList = departmentDao.findAllByParentId(departmentId);
+        if(departmentList!=null){
+            departmentList.forEach(department -> {
+                getDepartmentList(department.getId(),deIds);
+            });
+        }
+
+    }
+
 
     @Scheduled(cron = "0/30 * * * * ? ")
     public void userWorkDataMap(){