From e67a8a7477096a295d65afa1c366d2b59f8752fc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 20 Feb 2024 14:20:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/service/impl/MenuServiceImpl.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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..5734262 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;
@@ -75,7 +74,7 @@
private final static Integer MENU_CATEGORY = 1;
@Resource
- private IUserHouseLabelService iUserHouseLabelService;
+ private final IUserHouseLabelService iUserHouseLabelService;
@Override
public List<MenuVO> lazyList(Long parentId, Map<String, Object> param) {
@@ -127,7 +126,7 @@
roleMenus = tenantPackageMenu(baseMapper.roleMenuByRoleId(Func.toLongList(roleId), menuType));
// 1:居民，居民需要通过人的标签来显示取保候审
if (CommonConstant.RESIDENT.equals(roleName)) {
- extracted(labelType, roleMenus);
+ // extracted(labelType, roleMenus);
}
}
// 顶部菜单请求返回对应角色权限菜单
@@ -169,10 +168,17 @@
Collection<? extends Serializable> union = CollectionUtils.intersection(integerList, integers);
if (union.size() == 0) {
iterator.remove();
+
+ // 场所的时候，删除取保候审
+ } else if (CommonConstant.NUMBER_TWO.equals(labelType)) {
+ if (next.getName().trim().equals("取保候审")) {
+ iterator.remove();
+ }
}
- }
- if (next.getName().trim().equals("取保候审") && CommonConstant.NUMBER_ZERO.equals(labelType)) {
- iterator.remove();
+ } else {
+ if (next.getName().trim().equals("取保候审")) {
+ iterator.remove();
+ }
}
}
}
--
Gitblit v1.9.3