用户的修改配置

platform/src/main/java/com/jzg/service/impl/SysUserServiceImpl.java

@@ -56,8 +56,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
                     .collect(Collectors.groupingBy(SysUserRole::getUserId));
             userList.forEach(sysUser -> {
                 if(nameMap.containsKey(sysUser.getId())){
-                    sysUser.setRoleNameList(nameMap.get(sysUser.getId()).stream()
-                            .map(SysUserRole::getName).collect(Collectors.toList()));
+                    List<SysUserRole> userRoles = nameMap.get(sysUser.getId());
+                    List<String> roleNames = new ArrayList<>();
+                    userRoles.forEach(sysUserRole -> {
+                        if(StringUtils.isNotEmpty(sysUserRole.getName())){
+                            roleNames.add(sysUserRole.getName());
+                        }
+                    });
+                    sysUser.setRoleNameList(roleNames);
                 }
             });
         }
@@ -80,8 +86,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         List<SysUserRole> roleIds  = sysRoleMapper.queryByUserIds(userIdList);
         Map<String,List<SysUserRole>> nameMap = roleIds.stream()
                 .collect(Collectors.groupingBy(SysUserRole::getUserId));
-        vo.setRoleNameList(nameMap.get(user.getId()).stream()
-                .map(SysUserRole::getName).collect(Collectors.toList()));
+        List<SysUserRole> userRoles = nameMap.get(vo.getId());
+        List<String> roleNames = new ArrayList<>();
+        userRoles.forEach(sysUserRole -> {
+            if(StringUtils.isNotEmpty(sysUserRole.getName())){
+                roleNames.add(sysUserRole.getName());
+            }
+        });
+        vo.setRoleNameList(roleNames);
         return vo;
     }
 

platform/src/main/resources/mapper/SysUserMapper.xml

@@ -39,7 +39,7 @@
             <if test="param.searchValue != null and param.searchValue != ''">
                 and ( sr.username = #{param.searchValue} or sr.mobile = #{param.searchValue} or sr.id = #{param.searchValue})
             </if>
-             and sr.is_delete = 0
+             and sr.is_delete = 0 and si.system_code = 'PLATFORM'
         </where>
         ORDER BY create_time DESC
     </select>