|
@@ -1,5 +1,6 @@
|
|
|
package com.ruoyi.system.service.impl;
|
|
|
|
|
|
+import cn.hutool.core.collection.CollUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
@@ -29,6 +30,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Arrays;
|
|
|
import java.util.List;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* 用户 业务层处理
|
|
@@ -127,14 +129,10 @@ public class SysUserServiceImpl extends ServicePlusImpl<SysUserMapper, SysUser,
|
|
|
@Override
|
|
|
public String selectUserRoleGroup(String userName) {
|
|
|
List<SysRole> list = roleMapper.selectRolesByUserName(userName);
|
|
|
- StringBuilder idsStr = new StringBuilder();
|
|
|
- for (SysRole role : list) {
|
|
|
- idsStr.append(role.getRoleName()).append(",");
|
|
|
+ if (CollUtil.isEmpty(list)) {
|
|
|
+ return StringUtils.EMPTY;
|
|
|
}
|
|
|
- if (StringUtils.isNotEmpty(idsStr.toString())) {
|
|
|
- return idsStr.substring(0, idsStr.length() - 1);
|
|
|
- }
|
|
|
- return idsStr.toString();
|
|
|
+ return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(","));
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -146,14 +144,10 @@ public class SysUserServiceImpl extends ServicePlusImpl<SysUserMapper, SysUser,
|
|
|
@Override
|
|
|
public String selectUserPostGroup(String userName) {
|
|
|
List<SysPost> list = postMapper.selectPostsByUserName(userName);
|
|
|
- StringBuilder idsStr = new StringBuilder();
|
|
|
- for (SysPost post : list) {
|
|
|
- idsStr.append(post.getPostName()).append(",");
|
|
|
- }
|
|
|
- if (StringUtils.isNotEmpty(idsStr.toString())) {
|
|
|
- return idsStr.substring(0, idsStr.length() - 1);
|
|
|
+ if (CollUtil.isEmpty(list)) {
|
|
|
+ return StringUtils.EMPTY;
|
|
|
}
|
|
|
- return idsStr.toString();
|
|
|
+ return list.stream().map(SysPost::getPostName).collect(Collectors.joining(","));
|
|
|
}
|
|
|
|
|
|
/**
|