From 8537a8d58b5a3750b57d76367ef51f086af271df Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 18 四月 2024 00:09:40 +0800
Subject: [PATCH] 集团属性池映射界面代码完善
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java
index 9139a1f..764c61d 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java
@@ -99,7 +99,6 @@
List<Menu> allMenus = baseMapper.allMenu();
List<Menu> roleMenus;
// 瓒呯骇绠＄悊鍛樺苟涓斾笉鏄《閮ㄨ彍鍗曡姹傚垯杩斿洖鍏ㄩ儴鑿滃崟
- // if (AuthUtil.isAdministrator() && Func.isEmpty(topMenuId)) {
if (VciBaseUtil.checkAdminTenant() && Func.isEmpty(topMenuId)) {
roleMenus = allMenus;
}
@@ -229,6 +228,7 @@
* 绉熸埛鑿滃崟鏉冮檺鑷畾涔夌瓫閫�
*/
private List<Menu> tenantPackageMenu(List<Menu> menu) {
+ // 绉熸埛鍖呴厤缃煡璇�
TenantPackage tenantPackage = SysCache.getTenantPackage(AuthUtil.getTenantId());
if (Func.isNotEmpty(tenantPackage) && tenantPackage.getId() > 0L) {
List<Long> menuIds = Func.toLongList(tenantPackage.getMenuId());
@@ -345,7 +345,7 @@
}
// 杩斿洖鐨勫垎绫籵id鏄綋鍓嶈妭鐐逛负绗竴涓紝鍚庨潰渚濇鏄粬鐨勪笂灞傝妭鐐�
List<String> classifyOidList = listR.getData();
- final String roleIds = AuthUtil.getUser().getRoleId();
+ final List<String> roleIds = Func.toStrList(",",AuthUtil.getUser().getRoleId());
// 鍏堟煡璇㈡寜閽甶d鍒楄〃
LambdaQueryWrapper<ClassifyAuth> wrapper = Wrappers.<ClassifyAuth>query()
.lambda().eq(ClassifyAuth::getClassifyId, classifyId)
@@ -359,6 +359,7 @@
classifyAuths = classifyAuthMapper.selectList(
Wrappers.<ClassifyAuth>query()
.lambda().eq(ClassifyAuth::getClassifyId, classifyOidList.get(i))
+ .eq(ClassifyAuth::getAuthType,authType)
.in(ClassifyAuth::getRoleId, roleIds)
);
if(!classifyAuths.isEmpty()){
@@ -366,9 +367,17 @@
}
}
}
- //鍑虹幇浜嗛敊璇暟鎹紝鍚屼竴涓鑹插拰鍚屼竴涓垎绫籭d瀛樺湪澶氭潯鎺堟潈璁板綍
+ //鍑虹幇浜嗗鏉℃暟鎹�
if(classifyAuths.size()>1){
- throw new ServiceException("瑙掕壊鍜屽垎绫婚厤缃瓨鍦ㄥ鏉¤褰曪紝璇疯仈绯荤鐞嗕汉鍛樻竻鐞嗛敊璇厤缃紒");
+ // 鏍￠獙鏄惁瀛樺湪閿欒鏁版嵁锛屽悓涓�涓鑹插拰鍚屼竴涓垎绫籭d瀛樺湪澶氭潯鎺堟潈璁板綍
+ List<ClassifyAuth> finalClassifyAuths = classifyAuths;
+ boolean hasDuplicate = classifyAuths.stream()
+ .anyMatch(auth1 -> finalClassifyAuths.stream()
+ .filter(auth2 -> auth1 != auth2)
+ .anyMatch(auth2 -> auth1.getRoleId().equals(auth2.getRoleId()) && auth1.getClassifyId().equals(auth2.getClassifyId())));
+ if (hasDuplicate) {
+ throw new ServiceException("瑙掕壊鍜屽垎绫婚厤缃瓨鍦ㄥ鏉¤褰曪紝璇疯仈绯荤鐞嗕汉鍛樻竻鐞嗛敊璇厤缃紒");
+ }
}
// 鏄惁涓鸿秴绠�
Boolean isAdmin = VciBaseUtil.checkAdminTenant();
@@ -379,7 +388,10 @@
List<String> ids = new ArrayList<>();
// 濡傛灉涓嶆槸瓒呯鐢ㄦ埛
if(!isAdmin){
- ids.addAll(Arrays.asList(classifyAuths.get(0).getButtonIds().split(",")));
+ String concatenatedButtonIds = classifyAuths.stream()
+ .map(ClassifyAuth::getButtonIds) // 鑾峰彇姣忎釜classifyAuths瀵硅薄鐨刡uttonIds
+ .collect(Collectors.joining(",")); // 鐢ㄩ�楀彿鍒嗛殧鎷兼帴鎴愪竴涓瓧绗︿覆
+ ids.addAll(Arrays.asList(concatenatedButtonIds.split(",")));
}
return this.getMenuListByCode(ids,btmType,roleIds);
}
@@ -494,7 +506,7 @@
* @return
*/
@Override
- public List<Menu> getMenuListByCode(List<String> ids,String menuCode,String roleIds){
+ public List<Menu> getMenuListByCode(List<String> ids,String menuCode,List<String> roleIds){
List<Menu> menuButtonList = null;
if(VciBaseUtil.checkAdminTenant()){
// 姝ｅ父鎯呭喌涓嬫潵璇磋繖涓笉瀛樺湪涓虹┖鐨勬儏鍐�
--
Gitblit v1.9.3