From ca7adba95666768f18771713b0c49218c09c566e Mon Sep 17 00:00:00 2001
From: zer0Black <lxtalx@gmail.com>
Date: Thu, 12 Oct 2023 16:51:16 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90modify=E3=80=91=20=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=85=B3=E8=81=94=20=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=EF=BC=88=E6=89=B9=E9=87=8F=EF=BC=89=E7=9A=84=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=BC=A0=E8=BF=87=E6=9D=A5=E7=9A=84?=
 =?UTF-8?q?userId=E5=92=8C=E6=88=91=E4=BB=AC=E7=B3=BB=E7=BB=9F=E9=87=8C?=
 =?UTF-8?q?=E6=98=AF=E4=B8=8D=E4=B8=80=E6=A0=B7=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../docking/iam/service/SyncIamService.java   | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 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 7ce985d8..339f3eb2 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
@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jero.common.constant.CommonConstant;
+import com.jero.common.system.api.ISysBaseAPI;
+import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.DateUtils;
 import com.jero.common.util.PasswordUtil;
 import com.jero.common.util.UUIDGenerator;
@@ -73,6 +75,9 @@ public class SyncIamService {
     @Resource
     private ISysRolePermissionService sysRolePermissionService;
 
+    @Resource
+    private ISysBaseAPI sysBaseAPI;
+
     private String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
 
     /**
@@ -811,11 +816,20 @@ public class SyncIamService {
             List<SysUserRole> userRoleList = new ArrayList<>();
 
             for (UserRoleDto userRoleDto : userRoleDtoList){
-                SysUserRole sysUserRole = new SysUserRole();
-                sysUserRole.setUserId(userRoleDto.getUserId());
-                sysUserRole.setRoleId(userRoleDto.getArId());
+                if (CharSequenceUtil.isNotEmpty(userRoleDto.getAccountCode())){
+                    SysUserRole sysUserRole = new SysUserRole();
+                    // 根据 accountCode 字段（即用户名username） 从数据库里查出来用户id，在给到sysUserRole
+                    LoginUser userInfo = sysBaseAPI.getUserByName(userRoleDto.getAccountCode());
 
-                userRoleList.add(sysUserRole);
+                    if (userInfo == null){
+                        continue;
+                    }
+
+                    sysUserRole.setUserId(userInfo.getId());
+                    sysUserRole.setRoleId(userRoleDto.getArId());
+
+                    userRoleList.add(sysUserRole);
+                }
             }
             this.sysUserRoleService.saveBatch(userRoleList);
         } catch (Exception e){