Explorar el Código

feat:用户列表增加返回用户角色字段

Administrator hace 2 semanas
padre
commit
8296e3f8de

+ 14 - 0
jd-logistics-api/jd-logistics-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java

@@ -342,6 +342,20 @@ public class SysUser extends BaseEntity
         return agreeFlag;
     }
 
+    /**
+     * 获取角色名称列表,用于前端展示
+     * @return 角色名称列表
+     */
+    public List<String> getRoleNames() {
+        if (roles == null || roles.isEmpty()) {
+            return java.util.Collections.emptyList();
+        }
+        return roles.stream()
+                .filter(role -> role != null && role.getRoleName() != null)
+                .map(SysRole::getRoleName)
+                .collect(java.util.stream.Collectors.toList());
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

+ 1 - 2
jd-logistics-modules/jd-logistics-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -60,8 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
     
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
-		left join sys_dept d on u.dept_id = d.dept_id
+		<include refid="selectUserVo"/>
 		where u.del_flag = '0'
 		<if test="userId != null and userId != 0">
 			AND u.user_id = #{userId}