From 7f2921f26b0701c03d0b7a47b08ffe7179291bdf Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期一, 06 十二月 2021 20:35:59 +0800
Subject: [PATCH] !382 update 优化查询用户的角色组、岗位组代码 Merge pull request !382 from 疯狂的狮子Li/update
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 7e8443c..e80e7ae 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -2,6 +2,8 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +27,7 @@
import com.ruoyi.system.mapper.SysUserRoleMapper;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService;
+import org.springframework.util.CollectionUtils;
/**
* 鐢ㄦ埛 涓氬姟灞傚鐞�
@@ -127,16 +130,11 @@
public String selectUserRoleGroup(String userName)
{
List<SysRole> list = roleMapper.selectRolesByUserName(userName);
- StringBuffer idsStr = new StringBuffer();
- for (SysRole role : list)
+ if (CollectionUtils.isEmpty(list))
{
- idsStr.append(role.getRoleName()).append(",");
+ 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(","));
}
/**
@@ -149,16 +147,11 @@
public String selectUserPostGroup(String userName)
{
List<SysPost> list = postMapper.selectPostsByUserName(userName);
- StringBuffer idsStr = new StringBuffer();
- for (SysPost post : list)
+ if (CollectionUtils.isEmpty(list))
{
- idsStr.append(post.getPostName()).append(",");
+ return StringUtils.EMPTY;
}
- if (StringUtils.isNotEmpty(idsStr.toString()))
- {
- return idsStr.substring(0, idsStr.length() - 1);
- }
- return idsStr.toString();
+ return list.stream().map(SysPost::getPostName).collect(Collectors.joining(","));
}
/**
--
Gitblit v1.9.3