修改ad域控部门同步逻辑

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

@@ -3281,31 +3281,34 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     public HttpRespMsg syncDeptWithAD(HttpServletRequest request) throws Exception {
         Integer companyId = userMapper.selectById(request.getHeader("token")).getCompanyId();
         SysRole role = sysRoleMapper.selectOne(new QueryWrapper<SysRole>().eq("company_id",companyId).eq("rolename","普通员工"));
-        List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", companyId));
+        List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id",companyId));
         List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", companyId));
-//        List<JSONObject> deptArrays = ldapGetOU();
-//        for (JSONObject dept : deptArrays) {
-//            Department department=new Department();
-//            department.setDepartmentName(dept.getString("name"))
-//                    .setCompanyId(companyId);
-//            departmentMapper.insert(department);
-//        }
-//        List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id",companyId));
-//        for (JSONObject deptArray : deptArrays) {
-//            String canonicalName = deptArray.getString("canonicalName");
-//            Optional<Department> first = departmentList.stream().filter(dl -> dl.getDepartmentName().equals(deptArray.getString("name"))).findFirst();
-//            if(first.isPresent()){
-//                String[] split = canonicalName.split("/");
-//                if(split.length>2){
-//                    String s = split[split.length - 2];
-//                    Department one = departmentMapper.selectOne(new QueryWrapper<Department>().eq("department_name", s).eq("company_id",companyId));
-//                    if(one!=null&&Optional.of(one).isPresent()){
-//                        first.get().setSuperiorId(one.getDepartmentId());
-//                    }
-//                }
-//                departmentMapper.updateById(first.get());
-//            }
-//        }
+        List<JSONObject> deptArrays = ldapGetOU();
+        for (JSONObject dept : deptArrays) {
+            if(departmentList.stream().anyMatch(dl->dl.getDepartmentName().equals(dept.getString("name")))){
+                continue;
+            }
+            Department department=new Department();
+            department.setDepartmentName(dept.getString("name"))
+                    .setCompanyId(companyId);
+            departmentMapper.insert(department);
+        }
+        departmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id",companyId));
+        for (JSONObject deptArray : deptArrays) {
+            String canonicalName = deptArray.getString("canonicalName");
+            Optional<Department> first = departmentList.stream().filter(dl -> dl.getDepartmentName().equals(deptArray.getString("name"))).findFirst();
+            if(first.isPresent()){
+                String[] split = canonicalName.split("/");
+                if(split.length>2){
+                    String s = split[split.length - 2];
+                    Department one = departmentMapper.selectOne(new QueryWrapper<Department>().eq("department_name", s).eq("company_id",companyId));
+                    if(one!=null&&Optional.of(one).isPresent()){
+                        first.get().setSuperiorId(one.getDepartmentId());
+                    }
+                }
+                departmentMapper.updateById(first.get());
+            }
+        }
         List<JSONObject> userArrays = getUser();
         Integer[] ints = {514, 546, 66050, 66080, 66082};
         List<Integer> disable = Arrays.asList(ints);

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/TimingTask.java

@@ -659,29 +659,32 @@ public class TimingTask {
             SysRole role = sysRoleMapper.selectOne(new QueryWrapper<SysRole>().eq("company_id",compId).eq("rolename","普通员工"));
             List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id", compId));
             List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", compId));
-//        List<JSONObject> deptArrays = userService.ldapGetOU();
-//        for (JSONObject dept : deptArrays) {
-//            Department department=new Department();
-//            department.setDepartmentName(dept.getString("name"))
-//                    .setCompanyId(companyId);
-//            departmentMapper.insert(department);
-//        }
-//        List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id",companyId));
-//        for (JSONObject deptArray : deptArrays) {
-//            String canonicalName = deptArray.getString("canonicalName");
-//            Optional<Department> first = departmentList.stream().filter(dl -> dl.getDepartmentName().equals(deptArray.getString("name"))).findFirst();
-//            if(first.isPresent()){
-//                String[] split = canonicalName.split("/");
-//                if(split.length>2){
-//                    String s = split[split.length - 2];
-//                    Department one = departmentMapper.selectOne(new QueryWrapper<Department>().eq("department_name", s).eq("company_id",companyId));
-//                    if(one!=null&&Optional.of(one).isPresent()){
-//                        first.get().setSuperiorId(one.getDepartmentId());
-//                    }
-//                }
-//                departmentMapper.updateById(first.get());
-//            }
-//        }
+            List<JSONObject> deptArrays = userService.ldapGetOU();
+            for (JSONObject dept : deptArrays) {
+                if(departmentList.stream().anyMatch(dl->dl.getDepartmentName().equals(dept.getString("name")))){
+                    continue;
+                }
+                Department department=new Department();
+                department.setDepartmentName(dept.getString("name"))
+                        .setCompanyId(compId);
+                departmentMapper.insert(department);
+            }
+            departmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id",compId));
+            for (JSONObject deptArray : deptArrays) {
+                String canonicalName = deptArray.getString("canonicalName");
+                Optional<Department> first = departmentList.stream().filter(dl -> dl.getDepartmentName().equals(deptArray.getString("name"))).findFirst();
+                if(first.isPresent()){
+                    String[] split = canonicalName.split("/");
+                    if(split.length>2){
+                        String s = split[split.length - 2];
+                        Department one = departmentMapper.selectOne(new QueryWrapper<Department>().eq("department_name", s).eq("company_id",compId));
+                        if(one!=null&&Optional.of(one).isPresent()){
+                            first.get().setSuperiorId(one.getDepartmentId());
+                        }
+                    }
+                    departmentMapper.updateById(first.get());
+                }
+            }
             List<JSONObject> userArrays = userService.getUser();
             Integer[] ints = {514, 546, 66050, 66080, 66082};
             List<Integer> disable = Arrays.asList(ints);
@@ -690,7 +693,9 @@ public class TimingTask {
                     List<User> users = userList.stream().filter(ul -> ul.getPhone() != null).collect(Collectors.toList());
                     Optional<User> optional = users.stream().filter(ul -> ul.getPhone() != null && ul.getPhone().equals(user.getString("userPrincipalName"))).findFirst();
                     if(optional.isPresent()){
-                        userMapper.deleteById(optional.get().getId());
+                        User u = optional.get();
+                        u.setIsActive(0);
+                        userMapper.updateById(optional.get());
                     }
                     continue;
                 }