正在显示
1 个修改的文件
包含
9 行增加
和
16 行删除
| @@ -2,6 +2,8 @@ package com.ruoyi.system.service.impl; | @@ -2,6 +2,8 @@ package com.ruoyi.system.service.impl; | ||
| 2 | 2 | ||
| 3 | import java.util.ArrayList; | 3 | import java.util.ArrayList; |
| 4 | import java.util.List; | 4 | import java.util.List; |
| 5 | +import java.util.stream.Collectors; | ||
| 6 | + | ||
| 5 | import org.slf4j.Logger; | 7 | import org.slf4j.Logger; |
| 6 | import org.slf4j.LoggerFactory; | 8 | import org.slf4j.LoggerFactory; |
| 7 | import org.springframework.beans.factory.annotation.Autowired; | 9 | import org.springframework.beans.factory.annotation.Autowired; |
| @@ -25,6 +27,7 @@ import com.ruoyi.system.mapper.SysUserPostMapper; | @@ -25,6 +27,7 @@ import com.ruoyi.system.mapper.SysUserPostMapper; | ||
| 25 | import com.ruoyi.system.mapper.SysUserRoleMapper; | 27 | import com.ruoyi.system.mapper.SysUserRoleMapper; |
| 26 | import com.ruoyi.system.service.ISysConfigService; | 28 | import com.ruoyi.system.service.ISysConfigService; |
| 27 | import com.ruoyi.system.service.ISysUserService; | 29 | import com.ruoyi.system.service.ISysUserService; |
| 30 | +import org.springframework.util.CollectionUtils; | ||
| 28 | 31 | ||
| 29 | /** | 32 | /** |
| 30 | * 用户 业务层处理 | 33 | * 用户 业务层处理 |
| @@ -127,16 +130,11 @@ public class SysUserServiceImpl implements ISysUserService | @@ -127,16 +130,11 @@ public class SysUserServiceImpl implements ISysUserService | ||
| 127 | public String selectUserRoleGroup(String userName) | 130 | public String selectUserRoleGroup(String userName) |
| 128 | { | 131 | { |
| 129 | List<SysRole> list = roleMapper.selectRolesByUserName(userName); | 132 | List<SysRole> list = roleMapper.selectRolesByUserName(userName); |
| 130 | - StringBuffer idsStr = new StringBuffer(); | ||
| 131 | - for (SysRole role : list) | ||
| 132 | - { | ||
| 133 | - idsStr.append(role.getRoleName()).append(","); | ||
| 134 | - } | ||
| 135 | - if (StringUtils.isNotEmpty(idsStr.toString())) | 133 | + if (CollectionUtils.isEmpty(list)) |
| 136 | { | 134 | { |
| 137 | - return idsStr.substring(0, idsStr.length() - 1); | 135 | + return StringUtils.EMPTY; |
| 138 | } | 136 | } |
| 139 | - return idsStr.toString(); | 137 | + return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(",")); |
| 140 | } | 138 | } |
| 141 | 139 | ||
| 142 | /** | 140 | /** |
| @@ -149,16 +147,11 @@ public class SysUserServiceImpl implements ISysUserService | @@ -149,16 +147,11 @@ public class SysUserServiceImpl implements ISysUserService | ||
| 149 | public String selectUserPostGroup(String userName) | 147 | public String selectUserPostGroup(String userName) |
| 150 | { | 148 | { |
| 151 | List<SysPost> list = postMapper.selectPostsByUserName(userName); | 149 | List<SysPost> list = postMapper.selectPostsByUserName(userName); |
| 152 | - StringBuffer idsStr = new StringBuffer(); | ||
| 153 | - for (SysPost post : list) | ||
| 154 | - { | ||
| 155 | - idsStr.append(post.getPostName()).append(","); | ||
| 156 | - } | ||
| 157 | - if (StringUtils.isNotEmpty(idsStr.toString())) | 150 | + if (CollectionUtils.isEmpty(list)) |
| 158 | { | 151 | { |
| 159 | - return idsStr.substring(0, idsStr.length() - 1); | 152 | + return StringUtils.EMPTY; |
| 160 | } | 153 | } |
| 161 | - return idsStr.toString(); | 154 | + return list.stream().map(SysPost::getPostName).collect(Collectors.joining(",")); |
| 162 | } | 155 | } |
| 163 | 156 | ||
| 164 | /** | 157 | /** |
-
请 注册 或 登录 后发表评论