`fix`

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysUser.java

@@ -104,6 +104,8 @@ public class SysUser extends TenantEntity {
     private String remark;
 
 
+
+
     public SysUser(Long userId) {
         this.userId = userId;
     }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java

@@ -98,6 +98,7 @@ public class SysUserBo extends BaseEntity {
      */
     private Long[] postIds;
 
+
     /**
      * 数据权限 当前角色ID
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysUserVo.java

@@ -138,4 +138,6 @@ public class SysUserVo implements Serializable {
      */
     private Long roleId;
 
+    private String roleNames;
+
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java

@@ -60,6 +60,11 @@ public interface SysRoleMapper extends BaseMapperPlus<SysRole, SysRoleVo> {
      */
     List<Long> selectRoleListByUserId(Long userId);
 
+
+    List<SysRoleVo> selectRoleListAllByUserId(Long userId);
+
+
+
     /**
      * 根据用户ID查询角色
      *

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java

@@ -36,6 +36,7 @@ import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -58,7 +59,14 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
 
     @Override
     public TableDataInfo<SysUserVo> selectPageUserList(SysUserBo user, PageQuery pageQuery) {
-        Page<SysUserVo> page = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user));
+        QueryWrapper<SysUser> wrapper = (QueryWrapper<SysUser>)this.buildQueryWrapper(user);
+        if(user.getParams()!=null && user.getParams().get("roleNames")!=null){
+            wrapper.in("u.role_names", user.getParams().get("roleNames").toString().split(","));
+        }
+        Page<SysUserVo> page = baseMapper.selectPageUserList(pageQuery.build(), wrapper);
+        page.getRecords().forEach(sysUserVo -> {
+            sysUserVo.setRoles(roleMapper.selectRoleListAllByUserId(sysUserVo.getUserId()));
+        });
         return TableDataInfo.build(page);
     }
 

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -48,6 +48,11 @@
         where u.user_id = #{userId}
     </select>
 
+    <select id="selectRoleListAllByUserId" parameterType="Long" resultType="org.dromara.system.domain.vo.SysRoleVo">
+        <include refid="selectRoleVo"/>
+        where u.user_id = #{userId}
+    </select>
+
     <select id="selectRolesByUserName" parameterType="String" resultMap="SysRoleResult">
         select r.role_id,
                r.role_name,

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -68,13 +68,16 @@
     <select id="selectPageUserList" 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, u1.user_name as leaderName
-        from sys_user u
+            d.dept_name, d.leader, u1.user_name as leaderName,u.role_names
+        from sys_user_v u
             left join sys_dept d on u.dept_id = d.dept_id
             left join sys_user u1 on u1.user_id = d.leader
         ${ew.getCustomSqlSegment}
     </select>
 
+
+
+
     <select id="selectUserList" 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,

script/bin/ry.sh

@@ -3,7 +3,7 @@
 AppName=ruoyi-admin.jar
 
 # JVM参数
-JVM_OPTS="-Dname=$AppName  -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Xlog:gc*,:time,tags,level -XX:+UseZGC"
+JVM_OPTS="-Dname=$AppName  -Duser.timezone=Asia/Shanghai -Xms512m -Xmx1024m -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError "
 APP_HOME=`pwd`
 LOG_PATH=$APP_HOME/logs/$AppName.log
 
@@ -26,7 +26,7 @@ function start()
     if [ x"$PID" != x"" ]; then
         echo "$AppName is running..."
     else
-        nohup java $JVM_OPTS -jar $AppName > /dev/null 2>&1 &
+        nohup java $JVM_OPTS -jar $AppName
         echo "Start $AppName success..."
     fi
 }