From 2423ac966273e5b7530b140cc6ed28d36e42d4d3 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 22 Apr 2024 10:17:05 +0800
Subject: [PATCH] sso 初次提交
---
src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java | 31 ++-----------------------------
1 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java
index 8ac8560..83d1ea7 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java
@@ -18,7 +18,6 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
@@ -36,8 +35,6 @@
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
-import org.springblade.modules.house.dto.UserHouseLabelDTO;
-import org.springblade.modules.house.service.IUserHouseLabelService;
import org.springblade.modules.system.dto.MenuDTO;
import org.springblade.modules.system.entity.*;
import org.springblade.modules.system.mapper.MenuMapper;
@@ -74,9 +71,6 @@
private final static String PARENT_ID = "parentId";
private final static Integer MENU_CATEGORY = 1;
- @Resource
- private IUserHouseLabelService iUserHouseLabelService;
-
@Override
public List<MenuVO> lazyList(Long parentId, Map<String, Object> param) {
if (Func.isEmpty(Func.toStr(param.get(PARENT_ID)))) {
@@ -112,7 +106,7 @@
@Override
- public List<MenuVO> routes(String roleId, Long topMenuId, Integer labelType, Integer menuType, String roleName) {
+ public List<MenuVO> routes(String roleId, Long topMenuId, Integer labelType, Integer menuType, String roleName,String houseCode) {
if (StringUtil.isBlank(roleId)) {
return null;
}
@@ -125,10 +119,6 @@
// 非超级管理员并且不是顶部菜单请求则返回对应角色权限菜单
else if (!AuthUtil.isAdministrator() && Func.isEmpty(topMenuId)) {
roleMenus = tenantPackageMenu(baseMapper.roleMenuByRoleId(Func.toLongList(roleId), menuType));
- // 1:居民，居民需要通过人的标签来显示取保候审
- if (CommonConstant.RESIDENT.equals(roleName)) {
- extracted(labelType, roleMenus);
- }
}
// 顶部菜单请求返回对应角色权限菜单
else {
@@ -154,27 +144,10 @@
* @param roleMenus
* @param labelType
*/
- private void extracted(Integer labelType, List<Menu> roleMenus) {
- UserHouseLabelDTO userHouseLabelDTO = new UserHouseLabelDTO();
- userHouseLabelDTO.setUserId(AuthUtil.getUserId());
- userHouseLabelDTO.setLableType(labelType);
- List<Integer> integers = iUserHouseLabelService.selectUserLabelList(userHouseLabelDTO);
+ private void extracted(Integer labelType, List<Menu> roleMenus,String houseCode) {
Iterator<Menu> iterator = roleMenus.iterator();
while (iterator.hasNext()) {
Menu next = iterator.next();
- if (!next.getParentId().equals(0)) {
- if (StringUtils.isNotBlank(next.getLabelId())) {
- String[] split = next.getLabelId().split(",");
- List<Integer> integerList = Arrays.stream(split).map(Integer::valueOf).collect(Collectors.toList());
- Collection<? extends Serializable> union = CollectionUtils.intersection(integerList, integers);
- if (union.size() == 0) {
- iterator.remove();
- }
- }
- if (next.getName().trim().equals("取保候审") && CommonConstant.NUMBER_ZERO.equals(labelType)) {
- iterator.remove();
- }
- }
}
}
--
Gitblit v1.9.3