From 94c34f08015c3f5f4d839354958aea88b31473a0 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 21 一月 2022 11:13:07 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 35 insertions(+), 16 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 16d91ac..4db2080 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,9 @@
import javax.annotation.Resource;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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 +33,7 @@
import com.panzhihua.service_user.service.RoleService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.util.StringUtils;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -105,19 +109,17 @@
* @return 角色集合
*/
@Override
- public R listRoleBackstage(Long communityId) {
- List<SysRoleDO> sysRoleDOS =
- roleDAO.selectList(new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getCommunityId, communityId));
- if (ObjectUtils.isEmpty(sysRoleDOS)) {
- return R.fail("角色列表为空");
+ public R listRoleBackstage(Long communityId,Integer pageNum,Integer pageSize,String areaCode) {
+ LambdaQueryWrapper<SysRoleDO> queryWrapper=new QueryWrapper<SysRoleDO>().lambda().eq(SysRoleDO::getCommunityId, communityId);
+ if(com.panzhihua.common.utlis.StringUtils.isNotEmpty(areaCode)){
+ queryWrapper.eq(SysRoleDO::getAreaCode,areaCode);
}
- List<RoleVO> roleVOS = new ArrayList<>();
- sysRoleDOS.forEach(sysRoleDO -> {
- RoleVO roleVO = new RoleVO();
- BeanUtils.copyProperties(sysRoleDO, roleVO);
- roleVOS.add(roleVO);
- });
- return R.ok(roleVOS);
+ queryWrapper.orderByDesc(SysRoleDO::getCreateAt);
+ IPage<SysRoleDO> sysRoleDOIPage=this.roleDAO.selectPage(new Page<>(pageNum,pageSize),queryWrapper);
+ if (ObjectUtils.isEmpty(sysRoleDOIPage.getRecords())) {
+ return R.ok("角色列表为空");
+ }
+ return R.ok(sysRoleDOIPage);
}
/**
@@ -137,9 +139,7 @@
} catch (Exception e) {
e.printStackTrace();
log.error("新增角色失败，失败原因【{}】", e.getMessage());
- if (e.getMessage().contains("unique_role_name_community_id")) {
return R.fail("角色已经存在");
- }
}
if (insert > 0) {
SysRoleDO roleDO = roleDAO.selectOne(new QueryWrapper<SysRoleDO>().lambda()
@@ -226,6 +226,12 @@
public R putMenuRole(MenuRoleVO menuRoleVO) {
List<Long> menuIds = new ArrayList<>();
Long roleId = menuRoleVO.getRoleId();
+ if(!StringUtils.isEmpty(menuRoleVO.getRoleName())){
+ SysRoleDO sysRoleDO=new SysRoleDO();
+ sysRoleDO.setRoleId(roleId);
+ sysRoleDO.setRoleName(menuRoleVO.getRoleName());
+ this.roleDAO.updateById(sysRoleDO);
+ }
// 删除旧的
sysRoleMenuDAO.delete(new QueryWrapper<SysRoleMenuDO>().lambda().eq(SysRoleMenuDO::getRoleId, roleId));
// 创建新的
@@ -233,7 +239,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();
@@ -312,7 +318,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