From 7b1849b87705bbcedbe6808842c8a2405fa94e60 Mon Sep 17 00:00:00 2001
From: 李天宇 <876263681@qq.com>
Date: 星期四, 12 九月 2024 20:05:53 +0800
Subject: [PATCH] 更新

---
 src/main/java/com/zy/common/web/AuthController.java |   29 +++++++----------------------
 1 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index 7f178c1..1afa304 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -479,34 +479,19 @@
     @ManagerAuth
     public R menuPda(@RequestBody HashMap<String,String> params){
         Long userId = getUserId();
-        String level = params.get("level");
-        Long id = Long.valueOf(params.get("id"));
-        List<RolePdaResource> rolePdaResources;
+        List<RolePermission> rolePermissions;
         if (userId == 9527L) {
-            rolePdaResources = rolePdaResourceService.selectList(new EntityWrapper<>());
+            rolePermissions = rolePermissionService.selectList(new EntityWrapper<>());
         } else {
             Long roleId = getUser().getRoleId();
-            rolePdaResources = rolePdaResourceService.selectList(new EntityWrapper<RolePdaResource>().eq("role_id", roleId));
+            rolePermissions = rolePermissionService.selectList(new EntityWrapper<RolePermission>().eq("role_id", roleId));
         }
-        if (Cools.isEmpty(rolePdaResources)) {
+        if (Cools.isEmpty(rolePermissions)) {
             return R.ok();
         }
-        List<Long> collect = rolePdaResources.stream().map(RolePdaResource::getResourceId).distinct().collect(Collectors.toList());
-        List<PdaResource> pdaResources = pdaResourceService.selectBatchIds(collect);
-        List<PdaResource> results = new ArrayList<>();
-
-        for (PdaResource pdaResource : pdaResources) {
-            if (Integer.parseInt(level) == 1) {
-                if (pdaResource.getLevel().equals(Short.valueOf(level))) {
-                    results.add(pdaResource);
-                }
-            } else {
-                if (pdaResource.getLevel().equals(Short.valueOf(level)) && pdaResource.getResourceId().equals(id)) {
-                    results.add(pdaResource);
-                }
-            }
-        }
-        return R.ok().add(results);
+        List<Long> collect = rolePermissions.stream().map(RolePermission::getPermissionId).distinct().collect(Collectors.toList());
+        List<Permission> permissions = permissionService.selectBatchIds(collect);
+        return R.ok().add(permissions);
     }
 
 }

--
Gitblit v1.9.1