diff --git a/src/main/java/com/tanpu/feo/feojob/jobs/OrgSyncByWxcpJob.java b/src/main/java/com/tanpu/feo/feojob/jobs/OrgSyncByWxcpJob.java index 8a5b0f02e5c30d103cf4ac6371113f4b0e96da96..9b6b3bc849850d6d4f07511443e279c72b8da531 100644 --- a/src/main/java/com/tanpu/feo/feojob/jobs/OrgSyncByWxcpJob.java +++ b/src/main/java/com/tanpu/feo/feojob/jobs/OrgSyncByWxcpJob.java @@ -182,13 +182,13 @@ public class OrgSyncByWxcpJob { for (WxCpUser wxCpUser : wxCpUserList) { // key employee_id + '&' + role_id String type = wxCpUser.getIsLeader() != null && wxCpUser.getIsLeader() == 1 ? RoleTypeEnum.TEAM.code : RoleTypeEnum.IFA.code; - hashMap.put(corpId + "_" + wxCpUser.getUserId() + "&" + roleMap.get(type), wxCpUser); + hashMap.put(corpId + "_" + StringUtils.lowerCase(wxCpUser.getUserId()) + "&" + roleMap.get(type), wxCpUser); } } for (EmployeeRoleEntity employeeRole : employeeRoleList) { String employeeId = employeeRole.getEmployeeId(); String roleId = employeeRole.getRoleId(); - String key = employeeId + "&" + roleId; + String key = StringUtils.lowerCase(employeeId) + "&" + roleId; WxCpUser wxCpUser = hashMap.get(key); //åˆ é™¤ if (ObjectUtil.isNull(wxCpUser)) { @@ -202,8 +202,9 @@ public class OrgSyncByWxcpJob { Map<String, List<EmployeeRoleEntity>> map = employeeRoleList.stream().collect(Collectors.groupingBy(EmployeeRoleEntity::getEmployeeId)); String adminRoleId = roleMap.get(RoleTypeEnum.ADMIN.code); for (String key : hashMap.keySet()) { + WxCpUser wxCpUser = hashMap.get(key); + String employeeId = corpId + "_" + wxCpUser.getUserId(); String[] split = key.split("&"); - String employeeId = split[0]; String roleId = split[1]; // å¦‚æžœå·²ç»æœ‰ä¸€ä¸ªadmin的角色,那么就ä¸è¦æ’入新的 List<EmployeeRoleEntity> roleList = map.get(employeeId); @@ -242,14 +243,14 @@ public class OrgSyncByWxcpJob { List<WxCpUser> wxCpUserList = wxCpDepartDto.getWxCpUserList(); for (WxCpUser wxCpUser : wxCpUserList) { // key department_id + '&' + employee_id - hashMap.put(orgId + "_" + wxCpDepartDto.getId() + "&" + corpId + "_" + wxCpUser.getUserId(), wxCpUser); + hashMap.put(orgId + "_" + wxCpDepartDto.getId() + "&" + corpId + "_" + StringUtils.lowerCase(wxCpUser.getUserId()), wxCpUser); } } for (DepartmentEmployeeEntity departmentEmployee : departmentEmployeeList) { String departmentId = departmentEmployee.getDepartmentId(); String employeeId = departmentEmployee.getEmployeeId(); - String key = departmentId + "&" + employeeId; + String key = departmentId + "&" + StringUtils.lowerCase(employeeId); WxCpUser wxCpUser = hashMap.get(key); if (ObjectUtil.isNull(wxCpUser)) { // åˆ é™¤ @@ -269,9 +270,8 @@ public class OrgSyncByWxcpJob { String type = wxCpUser.getIsLeader() != null && wxCpUser.getIsLeader() == 1 ? EmployeeDutyEnum.DIRECTOR.code : EmployeeDutyEnum.STAFF.code; String[] split = s.split("&"); String departmentId = split[0]; - String employeeId = split[1]; DepartmentEmployeeEntity departmentEmployee = new DepartmentEmployeeEntity(); - departmentEmployee.setEmployeeId(employeeId); + departmentEmployee.setEmployeeId(corpId + "_" + wxCpUser.getUserId()); departmentEmployee.setDepartmentId(departmentId); departmentEmployee.setType(type); departmentEmployee.setOrgId(orgId); @@ -375,13 +375,13 @@ public class OrgSyncByWxcpJob { for (WxCpDepartDto wxCpDepartDto : wxCpDepartDtoList) { List<WxCpUser> wxCpUserList = wxCpDepartDto.getWxCpUserList(); for (WxCpUser wxCpUser : wxCpUserList) { - hashMap.put(corpId + "_" + wxCpUser.getUserId(), wxCpUser); + hashMap.put(corpId + "_" + StringUtils.lowerCase(wxCpUser.getUserId()), wxCpUser); } } // 计算 å˜åŒ–æ•°æ® for (EmployeeEntity employee : employeeList) { - String employeeId = employee.getEmployeeId(); + String employeeId = StringUtils.lowerCase(employee.getEmployeeId()); WxCpUser wxCpUser = hashMap.get(employeeId); //åˆ é™¤ if (ObjectUtil.isNull(wxCpUser)) { @@ -440,14 +440,14 @@ public class OrgSyncByWxcpJob { for (WxCpDepartDto wxCpDepartDto : wxCpDepartDtoList) { List<WxCpUser> wxCpUserList = wxCpDepartDto.getWxCpUserList(); for (WxCpUser wxCpUser : wxCpUserList) { - hashMap.put(corpId + "_" + wxCpUser.getUserId(), wxCpUser); + hashMap.put(corpId + "_" + StringUtils.lowerCase(wxCpUser.getUserId()), wxCpUser); } } // 计算 å˜åŒ–æ•°æ® for (UserInfoEntity userInfo : userInfoList) { - String id = userInfo.getId(); + String id = StringUtils.lowerCase(userInfo.getId()); WxCpUser wxCpUser = hashMap.get(id); // åˆ é™¤ if (ObjectUtil.isNull(wxCpUser)) {