From e21e5675f21ade9ffb3d79cf02fd125071b853c2 Mon Sep 17 00:00:00 2001
From: ximu-tao <me_litao@outlook.com>
Date: Wed, 23 Apr 2025 16:17:51 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E7=AE=A1=E7=90=86=E5=91=98=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=93=8D=E5=BA=94=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/base/entity/sys/BaseSysUserEntity.java   | 11 +++++++++++
 .../service/sys/impl/BaseSysUserServiceImpl.java     | 12 +++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/cool/modules/base/entity/sys/BaseSysUserEntity.java b/src/main/java/com/cool/modules/base/entity/sys/BaseSysUserEntity.java
index b6a87fc..fa5b5c0 100644
--- a/src/main/java/com/cool/modules/base/entity/sys/BaseSysUserEntity.java
+++ b/src/main/java/com/cool/modules/base/entity/sys/BaseSysUserEntity.java
@@ -4,11 +4,15 @@ import com.cool.core.base.TenantEntity;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Table;
 import com.tangzc.mybatisflex.autotable.annotation.ColumnDefine;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
+import org.dromara.autotable.annotation.Ignore;
 import org.dromara.autotable.annotation.Index;
 import org.dromara.autotable.annotation.enums.IndexTypeEnum;
 
+import java.util.List;
+
 @Getter
 @Setter
 @Table(value = "base_sys_user", comment = "系统用户表")
@@ -58,4 +62,11 @@ public class BaseSysUserEntity extends TenantEntity<BaseSysUserEntity> {
 
     @ColumnDefine(comment = "socketId")
     private String socketId;
+    
+    
+    @Ignore
+    @Schema( description = "角色列表" )
+    private List<Long> roleIdList;
+
+    
 }
diff --git a/src/main/java/com/cool/modules/base/service/sys/impl/BaseSysUserServiceImpl.java b/src/main/java/com/cool/modules/base/service/sys/impl/BaseSysUserServiceImpl.java
index dc213f0..e333529 100644
--- a/src/main/java/com/cool/modules/base/service/sys/impl/BaseSysUserServiceImpl.java
+++ b/src/main/java/com/cool/modules/base/service/sys/impl/BaseSysUserServiceImpl.java
@@ -30,6 +30,8 @@ import lombok.RequiredArgsConstructor;
 import org.dromara.autotable.core.constants.DatabaseDialect;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 系统用户
  */
@@ -171,13 +173,17 @@ public class BaseSysUserServiceImpl extends BaseServiceImpl<BaseSysUserMapper, B
     }
 
     @Override
-    public Object info(Long id) {
+    public BaseSysUserEntity info(Long id) {
         BaseSysUserEntity userEntity = getById(id);
         Long[] roleIdList = baseSysPermsService.getRoles(id);
         BaseSysDepartmentEntity departmentEntity = baseSysDepartmentMapper.selectOneById(
             userEntity.getDepartmentId());
         userEntity.setPassword(null);
-        return Dict.parse(userEntity).set("roleIdList", roleIdList).set("departmentName",
-            departmentEntity != null ? departmentEntity.getName() : null);
+        
+        
+        userEntity.setRoleIdList(List.of(roleIdList));
+        userEntity.setDepartmentName(departmentEntity != null ? departmentEntity.getName() : userEntity.getDepartmentName()  );
+        
+        return userEntity;
     }
 }
\ No newline at end of file