角色编辑框中不需要有超级管理员，同时列表页没有管理员用户

src/main/java/com/diagbot/facade/SysUserFacade.java

@@ -399,7 +399,7 @@ public class SysUserFacade extends SysUserServiceImpl {
         checkUser(sysUserBaseVO.getUserId());
         SysUserRoleDTO sysUserRoleDTO = new SysUserRoleDTO();
         sysUserRoleDTO.setUserId(sysUserBaseVO.getUserId());
-        List<SysRoleDTO> sysRoleDTOList = sysRoleFacade.listForUser();
+        List<SysRoleDTO> sysRoleDTOList = sysRoleFacade.listFac();
         List<SysUserRole> sysUserRoleList
                 = sysUserRoleService.list(new QueryWrapper<SysUserRole>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())

src/main/resources/mapper/SysUserMapper.xml

@@ -88,7 +88,8 @@
                 INNER JOIN (
                 SELECT
                 t8.user_id AS userId,
-                group_concat(t9.`name` order by t9.id ASC) AS roleName
+                group_concat(t9.`name` order by t9.id ASC) AS roleName,
+                min(t9.id) as roleId
                 FROM
                 sys_user_role t8,
                 sys_role t9
@@ -96,7 +97,6 @@
                 t8.is_deleted = 'N'
                 AND t9.is_deleted = 'N'
                 AND t8.role_id = t9.id
-                AND t8.role_id != -1
                 AND t8.role_id = #{roleId}
                 GROUP BY
                 t8.user_id
@@ -106,14 +106,14 @@
                 LEFT JOIN (
                 SELECT
                 t8.user_id AS userId,
-                group_concat(t9.`name` order by t9.id ASC) AS roleName
+                group_concat(t9.`name` order by t9.id ASC) AS roleName,
+                min(t9.id) as roleId
                 FROM
                 sys_user_role t8,
                 sys_role t9
                 WHERE
                 t8.is_deleted = 'N'
                 AND t9.is_deleted = 'N'
-                AND t8.role_id != -1
                 AND t8.role_id = t9.id
                 GROUP BY
                 t8.user_id
@@ -121,7 +121,7 @@
             </otherwise>
         </choose>
         WHERE
-        1 = 1
+        t10.roleId != -1
         <if test="linkman != null and linkman != ''">
             and t3.linkman like CONCAT('%',#{linkman},'%')
         </if>