From 6ec2f685a9f0eb58e846058afe1e60ee8dbd2cc6 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期二, 12 一月 2021 09:48:33 +0800
Subject: [PATCH] 登录bug修复
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 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 5708a4f..e2c4dfa 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
@@ -158,14 +158,13 @@
/**
* 平台菜单列表
- *
- * @param type 1 运营平台 2 社区平台
+ * @param communityId 社区id 0 运营平台
* @return 菜单集合
*/
@Override
- public R listMenuBackstage(int type) {
+ public R listMenuBackstage(Long communityId) {
List<SysMenuVO> sysMenuVOS=new ArrayList<>();
- List<SysMenuDO> sysMenuDOS = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getParentId, 0).eq(SysMenuDO::getType,type).orderByAsc(SysMenuDO::getOrderNum));
+ List<SysMenuDO> sysMenuDOS = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getParentId, 0).eq(SysMenuDO::getCommunityId,communityId).orderByAsc(SysMenuDO::getOrderNum));
if (!ObjectUtils.isEmpty(sysMenuDOS)) {
sysMenuDOS.forEach(sysMenuDO -> {
SysMenuVO sysMenuVO=new SysMenuVO();
@@ -203,7 +202,7 @@
// 创建新的
Integer isAll = menuRoleVO.getIsAll();
if (isAll.intValue()==1) {
- menuIds = sysMenuDAO.selectList(null).stream().map(sysMenuDO -> sysMenuDO.getMenuId()).collect(Collectors.toList());
+ menuIds = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getCommunityId,menuRoleVO.getCommunityId())).stream().map(sysMenuDO -> sysMenuDO.getMenuId()).collect(Collectors.toList());
}else{
menuIds=menuRoleVO.getMenuIds();
}
@@ -217,4 +216,41 @@
stringRedisTemplate.delete(SecurityConstants.ROLE_ALL);
return R.ok();
}
+
+ /**
+ * 用户菜单获取
+ *
+ * @param userId 登录用户id
+ * @return 用户菜单
+ */
+ @Override
+ public R listmenu(Long userId) {
+ SysUserRoleDO sysUserRoleDO = sysUserRoleDAO.selectOne(new QueryWrapper<SysUserRoleDO>().lambda().eq(SysUserRoleDO::getUserId, userId));
+ if (ObjectUtils.isEmpty(sysUserRoleDO)) {
+ return R.fail("用户未绑定角色");
+ }
+ Long roleId = sysUserRoleDO.getRoleId();
+ List<SysRoleMenuDO> sysRoleMenuDOS = sysRoleMenuDAO.selectList(new QueryWrapper<SysRoleMenuDO>().lambda().eq(SysRoleMenuDO::getRoleId, roleId));
+ if (ObjectUtils.isEmpty(sysRoleMenuDOS)) {
+ return R.fail("用户没有任何权限");
+ }
+ List<Long> collect = sysRoleMenuDOS.stream().map(sysRoleMenuDO -> sysRoleMenuDO.getMenuId()).collect(Collectors.toList());
+ List<SysMenuDO> sysMenuDOS = sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().in(SysMenuDO::getMenuId, collect));
+ List<SysMenuVO> sysMenuVOS=new ArrayList<>();
+ sysMenuDOS.forEach(sysMenuDO -> {
+ SysMenuVO sysMenuVO=new SysMenuVO();
+ BeanUtils.copyProperties(sysMenuDO,sysMenuVO);
+ sysMenuVOS.add(sysMenuVO);
+ });
+ List<SysMenuVO> collect1 = sysMenuVOS.stream().filter(sysMenuVO -> sysMenuVO.getParentId() == 0).collect(Collectors.toList());
+ if (!ObjectUtils.isEmpty(collect1)) {
+ collect1.forEach(sysMenuVO -> {
+ Long menuId = sysMenuVO.getMenuId();
+ List<SysMenuVO> sysMenuVOS1=sysMenuVOS.stream().filter(sysMenuVO1 -> sysMenuVO1.getParentId().intValue()==menuId.intValue()).collect(Collectors.toList());
+ sysMenuVO.setSysMenuVOList(sysMenuVOS1);
+ });
+ }
+
+ return R.ok(collect1);
+ }
}
--
Gitblit v1.7.1