From b4d2dbd68ed39bcf58c8afe50d7f5c06f14c237c Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 27 二月 2023 09:51:55 +0800
Subject: [PATCH] bug修改
---
ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java
index 68dde62..3d35c0e 100644
--- a/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java
+++ b/ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java
@@ -28,7 +28,7 @@
* Created by macro on 2018/9/30.
*/
@Service
-public class UmsRoleServiceImpl extends ServiceImpl<UmsRoleMapper, UmsRole>implements UmsRoleService {
+public class UmsRoleServiceImpl extends ServiceImpl<UmsRoleMapper, UmsRole> implements UmsRoleService {
@Autowired
private UmsAdminCacheService adminCacheService;
@Autowired
@@ -37,6 +37,7 @@
private UmsRoleResourceRelationService roleResourceRelationService;
private UmsMenuService umsMenuService;
+
@Autowired
public void setUmsMenuService(UmsMenuService umsMenuService) {
this.umsMenuService = umsMenuService;
@@ -48,6 +49,7 @@
private UmsResourceMapper umsResourceMapper;
@Resource
private DataDictionaryMapper dataDictionaryMapper;
+
@Override
public boolean create(UmsRole role) {
role.setCreateTime(new Date());
@@ -65,23 +67,24 @@
@Override
public Page<UmsRole> list(String keyword, Integer pageSize, Integer pageNum) {
- Page<UmsRole> page = new Page<>(pageNum,pageSize);
+ Page<UmsRole> page = new Page<>(pageNum, pageSize);
QueryWrapper<UmsRole> wrapper = new QueryWrapper<>();
LambdaQueryWrapper<UmsRole> lambda = wrapper.lambda();
- if(StrUtil.isNotEmpty(keyword)){
- lambda.like(UmsRole::getName,keyword);
+ if (StrUtil.isNotEmpty(keyword)) {
+ lambda.like(UmsRole::getName, keyword);
}
Page<UmsRole> resultPage = page(page, wrapper);
List<UmsRole> roles = resultPage.getRecords();
List<Long> types = roles.stream().map(UmsRole::getType).collect(Collectors.toList());
-
- LambdaQueryWrapper<DataDictionary> dicQuery = new LambdaQueryWrapper<>();
- dicQuery.in(DataDictionary::getId, types);
- List<DataDictionary> dics = dataDictionaryMapper.selectList(dicQuery);
- for (UmsRole role : roles) {
- for (DataDictionary dic : dics) {
- if (dic.getId().equals(role.getType())) {
- role.setTypeText(dic.getName());
+ if (types.size() > 0) {
+ LambdaQueryWrapper<DataDictionary> dicQuery = new LambdaQueryWrapper<>();
+ dicQuery.in(DataDictionary::getId, types);
+ List<DataDictionary> dics = dataDictionaryMapper.selectList(dicQuery);
+ for (UmsRole role : roles) {
+ for (DataDictionary dic : dics) {
+ if (dic.getId().equals(role.getType())) {
+ role.setTypeText(dic.getName());
+ }
}
}
}
@@ -112,7 +115,7 @@
public int allocMenu(Long roleId, List<Long> menuIds) {
//鍏堝垹闄ゅ師鏈夊叧绯�
QueryWrapper<UmsRoleMenuRelation> wrapper = new QueryWrapper<>();
- wrapper.lambda().eq(UmsRoleMenuRelation::getRoleId,roleId);
+ wrapper.lambda().eq(UmsRoleMenuRelation::getRoleId, roleId);
roleMenuRelationService.remove(wrapper);
//鎵归噺鎻掑叆鏂板叧绯�
List<UmsRoleMenuRelation> relationList = new ArrayList<>();
@@ -130,7 +133,7 @@
public int allocResource(Long roleId, List<Long> resourceIds) {
//鍏堝垹闄ゅ師鏈夊叧绯�
QueryWrapper<UmsRoleResourceRelation> wrapper = new QueryWrapper<>();
- wrapper.lambda().eq(UmsRoleResourceRelation::getRoleId,roleId);
+ wrapper.lambda().eq(UmsRoleResourceRelation::getRoleId, roleId);
roleResourceRelationService.remove(wrapper);
//鎵归噺鎻掑叆鏂板叧绯�
List<UmsRoleResourceRelation> relationList = new ArrayList<>();
@@ -149,11 +152,11 @@
public Boolean updateStatusBatch(List<Long> ids, Integer status) {
List<UmsRole> roles = new ArrayList<>();
for (Long id : ids) {
- UmsRole umsRole = UmsRole.builder().
+ UmsRole umsRole = UmsRole.builder().
id(id).status(status).build();
roles.add(umsRole);
}
- updateBatchById(roles,roles.size());
+ updateBatchById(roles, roles.size());
adminCacheService.delResourceListByRoleIds(ids);
return true;
}
--
Gitblit v1.8.0