From d5bb894f9be2e0a3b62d475b60b44f2ab138528c Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 12 六月 2025 16:48:35 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionBasicService.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionBasicService.java b/north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionBasicService.java
index c1669a6..829d258 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionBasicService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/userInfo/PermissionBasicService.java
@@ -17,8 +17,8 @@
this.permissionBasicMapper = permissionBasicMapper;
}
- public List<PermissionBasic> getPermission(Integer userId, String lang, List<Integer> selectPageId) {
- return permissionBasicMapper.getPermission(userId,lang, selectPageId.get(1));
+ public List<PermissionBasic> getPermission(Integer roleId, String lang, List<Integer> selectPageId) {
+ return permissionBasicMapper.getPermission(roleId,lang, selectPageId.get(1));
}
public Object getPermissionList(String lang) {
@@ -26,11 +26,10 @@
List<Map<String,Object>> ListOne = new ArrayList<>();
for(PermissionBasic permissionBasic : getOne){
-
Map<String,Object> map = new HashMap<>();
map.put("value",permissionBasic.getId());
map.put("label",permissionBasic.getMenu());
- map.put("children",permissionBasicMapper.selectTowLevel(permissionBasic.getMenu()));
+ map.put("children",permissionBasicMapper.selectTowLevel(permissionBasic.getId()));
ListOne.add(map);
}
--
Gitblit v1.8.0