From 360accaf390a8541a325936522ad863ef7b04632 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 27 十二月 2023 16:40:23 +0800
Subject: [PATCH] 密码修改对话框修改，密码修改原密码传参修改
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/MenuServiceImpl.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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 f5682d4..50fdfa6 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
@@ -103,7 +103,7 @@
roleMenus = allMenus;
}
// 闈炶秴绾х鐞嗗憳骞朵笖涓嶆槸椤堕儴鑿滃崟璇锋眰鍒欒繑鍥炲搴旇鑹叉潈闄愯彍鍗�
- else if (!AuthUtil.isAdministrator() && Func.isEmpty(topMenuId)) {
+ else if (!VciBaseUtil.checkAdminTenant() && Func.isEmpty(topMenuId)) {
roleMenus = tenantPackageMenu(baseMapper.roleMenuByRoleId(Func.toLongList(roleId)));
}
// 椤堕儴鑿滃崟璇锋眰杩斿洖瀵瑰簲瑙掕壊鏉冮檺鑿滃崟
@@ -353,7 +353,7 @@
LambdaQueryWrapper<Menu> wrapper = Wrappers.<Menu>query()
.lambda()
.in(Menu::getCode, codes)
- .eq(Menu::getIsDeleted,0) /*鏈鍒犻櫎*/
+ .eq(Menu::getIsDeleted,BladeConstant.DB_NOT_DELETED) /*鏈鍒犻櫎*/
.eq(Menu::getCategory,1) /*鑿滃崟绫诲瀷涓嶈兘涓烘寜閽�*/
.orderByAsc(Menu::getCode); /*鏍规嵁code鎺掑簭涓巆lassify鐨刡tmtypeid瀵瑰簲*/
// 瓒呯涓嶇敤鏍规嵁瑙掕壊鏉ユ煡璇�
@@ -441,4 +441,23 @@
return this.saveBatch(newButtons) ? R.success("鎸夐挳鍏嬮殕鎴愬姛锛�"):R.fail("鎸夐挳鍏嬮殕澶辫触锛�");
}
+ /**
+ * 鏍规嵁涓婚敭鑾峰彇鑿滃崟淇℃伅
+ * @param ids
+ * @return
+ */
+ @Override
+ public List<Menu> getMenuListById(List<String> ids,String parentId) {
+ LambdaQueryWrapper<Menu> wrapper = Wrappers.<Menu>query()
+ .lambda().eq(Menu::getCategory, "2")
+ .eq(Menu::getIsDeleted,BladeConstant.DB_NOT_DELETED);
+ if(VciBaseUtil.checkAdminTenant()){
+ wrapper.eq(Menu::getParentId,parentId);
+ }else {
+ wrapper.in(Menu::getId, ids);
+ }
+ List<Menu> menuList = this.list(wrapper);
+ return menuList;
+ }
+
}
--
Gitblit v1.9.3