新增项目增加企业微信模块通讯录搜索功能

组织架构中新增按钮：修正工时所属部门

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

@@ -952,7 +952,8 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
                 }
             }
             if (depts.size()!=0){
-                List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().in("corpwx_deptid", depts));
+                List<Department> departmentList = departmentMapper.selectList(new QueryWrapper<Department>().in("corpwx_deptid", depts).eq("company_id",companyId));
+                List<Department> allDepartmentList = departmentMapper.selectList(new QueryWrapper<Department>().eq("company_id",companyId));
                 List<User> userList = userMapper.selectList(new QueryWrapper<User>().eq("company_id", companyId));
                 List<DepartmentOtherManager> departmentOtherManagerList = departmentOtherManagerMapper.selectList(new QueryWrapper<DepartmentOtherManager>().eq("company_id", companyId));
                 //结果列表
@@ -961,8 +962,9 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
                 rootDepartments.forEach(root->{
                     DepartmentVO rootDeptVO = formatDepartmentToVO(root, departmentOtherManagerList);
                     list.add(rootDeptVO);
-                    fillSubDepartmentList(departmentList, rootDeptVO, departmentOtherManagerList);
+                    fillSubDepartmentList(allDepartmentList, rootDeptVO, departmentOtherManagerList);
                 });
+                System.out.println(list);
                 //处理部门下人员列表
                 List<DepartmentVO> userListWithDept = getUserListWithDept(userList, list);
                 HashMap<String, Object> data = new HashMap<>();

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

@@ -478,7 +478,7 @@ public class WxCorpInfoServiceImpl extends ServiceImpl<WxCorpInfoMapper, WxCorpI
     public List<String> getAdminOpenIdList(Integer companyId)throws Exception{
         List<String> userOpenIdList=new ArrayList<>();
         WxCorpInfo wxCorpInfo = wxCorpInfoMapper.selectOne(new QueryWrapper<WxCorpInfo>().eq("company_id", companyId));
-        String url=GET_ADMIN_LIST.replaceAll("SUITE_ACCESS_TOKEN",getSuiteAccessToken());
+        String url=GET_ADMIN_LIST.replace("SUITE_ACCESS_TOKEN",getSuiteAccessToken());
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
         JSONObject reqParam = new JSONObject();