From 5d9f3637b82a99aa9d9d4154a42501599dba4536 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期三, 19 十月 2022 14:43:13 +0800
Subject: [PATCH] 修改角色类型bug。
---
ycl-common/src/main/java/com/ycl/service/user/impl/UmsRoleServiceImpl.java | 21 ++++++++++++++++++++-
ycl-common/src/main/java/com/ycl/entity/user/UmsRole.java | 4 ++++
2 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/entity/user/UmsRole.java b/ycl-common/src/main/java/com/ycl/entity/user/UmsRole.java
index bdc2361..4129a88 100644
--- a/ycl-common/src/main/java/com/ycl/entity/user/UmsRole.java
+++ b/ycl-common/src/main/java/com/ycl/entity/user/UmsRole.java
@@ -1,6 +1,7 @@
package com.ycl.entity.user;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -52,5 +53,8 @@
private Integer sort;
+ @ApiModelProperty(value = "瑙掕壊绫诲瀷鏂囨湰")
+ @TableField(exist = false)
+ private String typeText;
}
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 2dae3bd..d610315 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
@@ -5,7 +5,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.entity.dict.DataDictionary;
import com.ycl.entity.user.*;
+import com.ycl.mapper.dict.DataDictionaryMapper;
import com.ycl.mapper.user.UmsMenuMapper;
import com.ycl.mapper.user.UmsResourceMapper;
import com.ycl.mapper.user.UmsRoleMapper;
@@ -20,6 +22,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.stream.Collectors;
/**
* 鍚庡彴瑙掕壊绠＄悊Service瀹炵幇绫�
@@ -37,6 +40,8 @@
private UmsMenuMapper umsMenuMapper;
@Resource
private UmsResourceMapper umsResourceMapper;
+ @Resource
+ private DataDictionaryMapper dataDictionaryMapper;
@Override
public boolean create(UmsRole role) {
role.setCreateTime(new Date());
@@ -60,7 +65,21 @@
if(StrUtil.isNotEmpty(keyword)){
lambda.like(UmsRole::getName,keyword);
}
- return page(page,wrapper);
+ 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());
+ }
+ }
+ }
+ return resultPage;
}
@Override
--
Gitblit v1.8.0