iam数据同步修改

laws-modules-docking/src/main/java/com/jero/modules/docking/iam/client/TestClient.java

@@ -46,10 +46,10 @@ public class TestClient {
 //            testClient.sendUserCreate(i);
 //        }
         // 创建用户接口测试
-        testClient.sendUserUpdate(); // 更新用户接口测试
+//        testClient.sendUserUpdate(); // 更新用户接口测试
 //        testClient.sendUserDel(); // 更新用户接口测试
 //        testClient.sendOrgCreate(); // 组织创建接口测试
-//        testClient.sendOrgUpdate(); // 组织修改接口测试
+        testClient.sendOrgUpdate(); // 组织修改接口测试
 //        testClient.sendOrgDel(); // 组织删除接口测试
 //        testClient.sendQueryAllUserIdsService(); // 查询所有用户ID接口测试
 //        testClient.sendQueryAllOrgIdsService(); // 查询所有组织ID接口测试
@@ -318,10 +318,11 @@ public class TestClient {
     private void sendOrgUpdate() throws JsonProcessingException {
         // 封装 IamUserAcceptDto 为用户数据层
         IamOrgAcceptDto iamOrgAcceptDto = new IamOrgAcceptDto();
-        iamOrgAcceptDto.setBimOrgId("IA00104");
+//        iamOrgAcceptDto.set__ENABLE__(true);
+        iamOrgAcceptDto.setBimOrgId("D10000005");
         iamOrgAcceptDto.setSrmsOrgCode("IA00104");
-        iamOrgAcceptDto.setSrmsDepartName("测试IAM部门1");
+        iamOrgAcceptDto.setSrmsDepartName("销售部1");
-        iamOrgAcceptDto.setSrmsParentCode("");
+        iamOrgAcceptDto.setSrmsParentCode("D10000001");
 
         iamOrgAcceptDto.setBimRequestId(UUIDUtils.randomUUID20());
         iamOrgAcceptDto.setBimRemoteUser("srmsIam");

laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/IamOrgAcceptDto.java

@@ -33,4 +33,11 @@ public class IamOrgAcceptDto extends IamCommonAcceptDto {
      */
     @IamProperty(required = true, multivalued = false)
     private String srmsParentCode;
+
+
+    /**
+     * 启用状态
+     */
+    @IamProperty(required = true, multivalued = false)
+    private Boolean __ENABLE__;
 }

laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java

@@ -503,20 +503,27 @@ public class SyncIamService {
         if (sysDepart == null){
             throw new IamGlobalException(orgAcceptDto.getBimRequestId(), "未查询到id为（" + orgAcceptDto.getBimOrgId() + "）组织，无法更新");
         }
+        if(!Objects.isNull(orgAcceptDto.get__ENABLE__())){
+            LambdaUpdateWrapper<SysDepart> updateSysDepart = new LambdaUpdateWrapper<>();
+            updateSysDepart.eq(SysDepart::getId,orgAcceptDto.getBimOrgId());
+            updateSysDepart.set(SysDepart::getStatus,orgAcceptDto.get__ENABLE__() ? 1 : 0);
+            updateSysDepart.set(SysDepart::getUpdateBy,DockingConstant.IAM_SYSTEM_NAME);
+            updateSysDepart.set(SysDepart::getUpdateTime,new Date());
+            sysDepartService.update(updateSysDepart);
+        }else{
+            if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsParentCode())){
+                sysDepart.setParentId(orgAcceptDto.getSrmsParentCode());
+            }
 
-        if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsParentCode())){
+            if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsDepartName())){
-            sysDepart.setParentId(orgAcceptDto.getSrmsParentCode());
+                sysDepart.setDepartName(orgAcceptDto.getSrmsDepartName());
+            }
+            sysDepart.setUpdateBy(DockingConstant.IAM_SYSTEM_NAME);
+            sysDepart.setUpdateTime(new Date());
+
+            // 存储到组织机构表中
+            this.sysDepartService.updateById(sysDepart);
         }
-
-        if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsDepartName())){
-            sysDepart.setDepartName(orgAcceptDto.getSrmsDepartName());
-        }
-        sysDepart.setUpdateBy(DockingConstant.IAM_SYSTEM_NAME);
-        sysDepart.setUpdateTime(new Date());
-
-        // 存储到组织机构表中
-        this.sysDepartService.updateById(sysDepart);
-
         return iamCommonResponseDto;
     }