From abb8f2db1cece826f433f380a0758fb730f465cd Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Fri, 31 May 2024 16:27:29 +0800 Subject: [PATCH] =?UTF-8?q?fix(iam):=20=E4=BA=BA=E5=91=98=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../docking/iam/service/SyncIamService.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) 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 7c30224b..f4725ee1 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 @@ -32,6 +32,7 @@ import com.jero.modules.docking.utils.DockingConstant; import com.jero.modules.system.entity.*; import com.jero.modules.system.service.*; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Value; @@ -41,10 +42,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.lang.reflect.Field; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; /** @@ -304,10 +302,15 @@ public class SyncIamService { // 获取组织机构(多个逗号分隔) String orgCode = userAcceptDto.getSrmsOrgCode(); - String selectedDeparts = null; if (CharSequenceUtil.isNotEmpty(orgCode)){ - selectedDeparts = orgCode; + List sysDepartList = sysDepartService.list( + new LambdaQueryWrapper() + .in(SysDepart::getOrgCode, Arrays.asList(orgCode.split(",")))); + if (CollectionUtils.isNotEmpty(sysDepartList)){ + selectedDeparts = sysDepartList.stream().map(SysDepart::getId) + .collect(Collectors.joining(",")); + } } // 编辑存储到用户表中，角色是系统自己处理的，更新不会影响角色，所以不传