From 5efb25463fb6a6825ab8c85b880815af32d37515 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期六, 11 五月 2024 16:38:06 +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 | 14 ++++++--------
1 files changed, 6 insertions(+), 8 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 f535f61..32c4f43 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
@@ -1,9 +1,7 @@
package com.example.erp.service.userInfo;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.entity.userInfo.PermissionBasic;
import com.example.erp.mapper.userInfo.PermissionBasicMapper;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -19,20 +17,20 @@
this.permissionBasicMapper = permissionBasicMapper;
}
- public List<PermissionBasic> getPermission(Integer userId) {
- return permissionBasicMapper.getPermission(userId);
+ public List<PermissionBasic> getPermission(Integer roleId, String lang, List<Integer> selectPageId) {
+ return permissionBasicMapper.getPermission(roleId,lang, selectPageId.get(1));
}
- public Object getPermissionList() {
- List<PermissionBasic> getOne = permissionBasicMapper.selectOneLevel();
+ public Object getPermissionList(String lang) {
+ List<PermissionBasic> getOne = permissionBasicMapper.selectOneLevel(lang);
List<Map<String,Object>> ListOne = new ArrayList<>();
for(PermissionBasic permissionBasic : getOne){
-
+ System.out.println(permissionBasic.getMenu());
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