From faae303cd25f90b1c732b6bc737ede8b8ab714a0 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 27 九月 2021 16:56:28 +0800
Subject: [PATCH] Merge branch 'test' into 'test_bak'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java
index 8bbe63b..e75a452 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java
@@ -6,6 +6,8 @@
import javax.annotation.Resource;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
@@ -30,6 +32,7 @@
import com.panzhihua.service_user.service.RoleService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.StringUtils;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -105,19 +108,12 @@
* @return 角色集合
*/
@Override
- public R listRoleBackstage(Long communityId) {
- List<SysRoleDO> sysRoleDOS =
- roleDAO.selectList(new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getCommunityId, communityId));
- if (ObjectUtils.isEmpty(sysRoleDOS)) {
+ public R listRoleBackstage(Long communityId,Integer pageNum,Integer pageSize) {
+ IPage<SysRoleDO> sysRoleDOIPage=this.roleDAO.selectPage(new Page<>(pageNum,pageSize),new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getCommunityId, communityId).orderByDesc(SysRoleDO::getCreateAt));
+ if (ObjectUtils.isEmpty(sysRoleDOIPage.getRecords())) {
return R.fail("角色列表为空");
}
- List<RoleVO> roleVOS = new ArrayList<>();
- sysRoleDOS.forEach(sysRoleDO -> {
- RoleVO roleVO = new RoleVO();
- BeanUtils.copyProperties(sysRoleDO, roleVO);
- roleVOS.add(roleVO);
- });
- return R.ok(roleVOS);
+ return R.ok(sysRoleDOIPage);
}
/**
@@ -224,7 +220,7 @@
public R putMenuRole(MenuRoleVO menuRoleVO) {
List<Long> menuIds = new ArrayList<>();
Long roleId = menuRoleVO.getRoleId();
- if(menuRoleVO.getRoleName()!=null){
+ if(!StringUtils.isEmpty(menuRoleVO.getRoleName())){
SysRoleDO sysRoleDO=new SysRoleDO();
sysRoleDO.setRoleId(roleId);
sysRoleDO.setRoleName(menuRoleVO.getRoleName());
@@ -237,7 +233,7 @@
if (isAll.intValue() == 1) {
menuIds = sysMenuDAO
.selectList(
- new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getCommunityId, menuRoleVO.getCommunityId()))
+ new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getCommunityId, 2))
.stream().map(sysMenuDO -> sysMenuDO.getMenuId()).collect(Collectors.toList());
} else {
menuIds = menuRoleVO.getMenuIds();
@@ -316,7 +312,20 @@
if (!ObjectUtils.isEmpty(sysRoleMenuDOS)) {
List<Long> longs =
sysRoleMenuDOS.stream().map(sysRoleMenuDO -> sysRoleMenuDO.getMenuId()).collect(Collectors.toList());
- return R.ok(longs);
+ List<SysMenuDO> sysMenuDOList=this.sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().in(SysMenuDO::getMenuId,longs).eq(SysMenuDO::getParentId,0));
+ sysMenuDOList.forEach(sysMenuDO -> {
+ List<SysMenuDO> sysMenuDOS=this.sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().in(SysMenuDO::getMenuId,longs).eq(SysMenuDO::getParentId,sysMenuDO.getMenuId()));
+ sysMenuDOS.forEach(sysMenuDO1 -> {
+ List<SysMenuDO> sysMenuDOS1=this.sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().in(SysMenuDO::getMenuId,longs).eq(SysMenuDO::getParentId,sysMenuDO1.getMenuId()));
+ if(!sysMenuDOS1.isEmpty()){
+ longs.remove(sysMenuDO1.getMenuId());
+ }
+ });
+ if(!sysMenuDOS.isEmpty()){
+ longs.remove(sysMenuDO.getMenuId());
+ }
+ });
+ return R.ok(longs);
}
return R.fail();
}
--
Gitblit v1.7.1