From bab8056b54549e7a95665185e73f7cf85d2f11a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Mon, 5 Aug 2024 17:08:54 +0800 Subject: [PATCH] =?UTF-8?q?iam=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docking/iam/client/TestClient.java | 11 ++++--- .../docking/iam/dto/IamOrgAcceptDto.java | 7 +++++ .../docking/iam/service/SyncIamService.java | 31 ++++++++++++------- 3 files changed, 32 insertions(+), 17 deletions(-) diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/client/TestClient.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/client/TestClient.java index 996d8d88..4ffecca4 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/client/TestClient.java +++ b/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.setSrmsParentCode(""); + iamOrgAcceptDto.setSrmsDepartName("销售部1"); + iamOrgAcceptDto.setSrmsParentCode("D10000001"); iamOrgAcceptDto.setBimRequestId(UUIDUtils.randomUUID20()); iamOrgAcceptDto.setBimRemoteUser("srmsIam"); diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/IamOrgAcceptDto.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/IamOrgAcceptDto.java index 2ad206a2..65046f21 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/IamOrgAcceptDto.java +++ b/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__; } diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java index 1eab110e..63992130 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java +++ b/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 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())){ - sysDepart.setParentId(orgAcceptDto.getSrmsParentCode()); + if (CharSequenceUtil.isNotEmpty(orgAcceptDto.getSrmsDepartName())){ + 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; }