修改取值逻辑

src/main/java/com/tanpu/feo/feojob/jobs/OrgSyncByWxcpJob.java

@@ -33,8 +33,7 @@ import java.util.*;
 @Slf4j
 public class OrgSyncByWxcpJob {
 
-    final static String keyStr = "{\"corpId\":\"ww08675a3a48c9e8a2\",\"agentId\":\"1000006\",\"corpSecret\":\"VNh2sdxSOPJ0wcHVoWWUrcCjXFXPsxOs12KkAogyCQI\",\"token\":\"jyzyceshi888\",\"aesKey\":\"wHkEDvDLOM8xqiuGn0VCeN9rtJWgeaQ12cxKpcmWsSS\",\"sendMessageAppId\":\"wxe177c62fa1e1c602\"}\n";
-
+    final static String keyStr = "{\"corpId\":\"ww08675a3a48c9e8a2\",\"agentId\":\"1000013\",\"corpSecret\":\"l7eLNC5DDNxmucc9emHsEaSXym4VKDy_D5w4IoOpvqk\",\"token\":\"E1zDvDkXWt\",\"aesKey\":\"43P8lbP5yt8AHLOUPGBPS252c60K9Vzofzm5NOxHHeP\",\"sendMessageAppId\":\"wxe177c62fa1e1c602\"}\n";
     @Resource
     private OrgExtService orgExtService;
     @Resource
@@ -309,7 +308,7 @@ public class OrgSyncByWxcpJob {
             }
             //更新
             Long parentId1 = wxCpDepartDto.getParentId();
-            String parentId = parentId1 == 1 ? null :orgId + "_" + parentId1;
+            String parentId = ObjectUtil.isNull(hashMap2.get(parentId1)) ? null :orgId + "_" + parentId1; // ObjectUtil.isNull(hashMap2.get(parentId1))
             if (!department.getDepartmentName().equals(wxCpDepartDto.getName()) || StrUtil.compareIgnoreCase(department.getParentDepartId(), parentId, false) != 0
             || !department.getMembers().equals(wxCpDepartDto.getMembers())) {
                 department.setDepartmentName(wxCpDepartDto.getName());
@@ -323,7 +322,7 @@ public class OrgSyncByWxcpJob {
         for (String departmentId : hashMap.keySet()) {
             WxCpDepartDto wxCpDepartDto = hashMap.get(departmentId);
             Long parentId1 = wxCpDepartDto.getParentId();
-            String parentId = parentId1 == 1 ? null :orgId + "_" + parentId1;
+            String parentId = ObjectUtil.isNull(hashMap2.get(parentId1)) ? null :orgId + "_" + parentId1;
             Department department = new Department();
             department.setDepartmentId(orgId + "_" + wxCpDepartDto.getId());
             department.setParentDepartId(parentId);
@@ -340,10 +339,11 @@ public class OrgSyncByWxcpJob {
     }
 
     private Integer getLevel(HashMap<Long, WxCpDepartDto> hashMap2, Long id) {
-        if (hashMap2.get(id).getParentId() == 1) {
+        Long parentId = hashMap2.get(id).getParentId();
+        if (ObjectUtil.isNull(hashMap2.get(parentId))) {
             return 1;
         }
-        return  1 + getLevel(hashMap2, hashMap2.get(id).getParentId());
+        return  1 + getLevel(hashMap2, parentId);
     }
 
     private WorkDataDto<Employee> employeeWork(String orgId, List<WxCpDepartDto> wxCpDepartDtoList, String corpId) {

src/main/java/com/tanpu/feo/feojob/jobs/service/OrgSyncByWxcpService.java

@@ -82,14 +82,14 @@ public class OrgSyncByWxcpService {
             employee.setUpdateBy("SYS");
             employee.setUpdateTime(now);
             employee.setDeleteTag("1");
-            employeeMapper.deleteById(employee);
+            employeeMapper.updateById(employee);
         }
         List<Employee> workEmployeeUpdateList = workEmployee.getUpdateList();
         for (Employee employee : workEmployeeUpdateList) {
             employee.setUpdateBy("SYS");
             employee.setUpdateTime(now);
             employee.setDeleteTag("0");
-            employeeMapper.deleteById(employee);
+            employeeMapper.updateById(employee);
         }
 
         //3
@@ -107,14 +107,14 @@ public class OrgSyncByWxcpService {
             department.setUpdateBy("SYS");
             department.setUpdateTime(now);
             department.setDeleteTag("1");
-            departmentMapper.deleteById(department);
+            departmentMapper.updateById(department);
         }
         List<Department> workDepartmentUpdateList = workDepartment.getUpdateList();
         for (Department department : workDepartmentUpdateList) {
             department.setUpdateBy("SYS");
             department.setUpdateTime(now);
             department.setDeleteTag("0");
-            departmentMapper.deleteById(department);
+            departmentMapper.updateById(department);
         }
         //4
         List<DepartmentEmployee> workDepartmentEmployeeInsertList = workDepartmentEmployee.getInsertList();
@@ -131,14 +131,14 @@ public class OrgSyncByWxcpService {
             departmentEmployee.setUpdateBy("SYS");
             departmentEmployee.setUpdateTime(now);
             departmentEmployee.setDeleteTag("1");
-            departmentEmployeeMapper.deleteById(departmentEmployee);
+            departmentEmployeeMapper.updateById(departmentEmployee);
         }
         List<DepartmentEmployee> workDepartmentEmployeeUpdateList = workDepartmentEmployee.getUpdateList();
         for (DepartmentEmployee departmentEmployee : workDepartmentEmployeeUpdateList) {
             departmentEmployee.setUpdateBy("SYS");
             departmentEmployee.setUpdateTime(now);
             departmentEmployee.setDeleteTag("0");
-            departmentEmployeeMapper.deleteById(departmentEmployee);
+            departmentEmployeeMapper.updateById(departmentEmployee);
         }
         //5
         List<EmployeeRole> workEmployeeRoleInsertList = workEmployeeRole.getInsertList();
@@ -155,14 +155,14 @@ public class OrgSyncByWxcpService {
             employeeRole.setUpdateBy("SYS");
             employeeRole.setUpdateTime(now);
             employeeRole.setDeleteTag("1");
-            employeeRoleMapper.deleteById(employeeRole);
+            employeeRoleMapper.updateById(employeeRole);
         }
         List<EmployeeRole> workEmployeeRoleUpdateList = workEmployeeRole.getUpdateList();
         for (EmployeeRole employeeRole : workEmployeeRoleUpdateList) {
             employeeRole.setUpdateBy("SYS");
             employeeRole.setUpdateTime(now);
             employeeRole.setDeleteTag("0");
-            employeeRoleMapper.deleteById(employeeRole);
+            employeeRoleMapper.updateById(employeeRole);
         }
         return assetsArrayList;
     }