From d29f311349e03ca0b57763b962460c8ef114ca66 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期日, 03 十一月 2024 18:23:16 +0800
Subject: [PATCH] 授予角色权限不校验上级权限

---
 src/main/java/com/zy/common/web/AuthController.java |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zy/common/web/AuthController.java b/src/main/java/com/zy/common/web/AuthController.java
index c590b7b..5fb3b5f 100644
--- a/src/main/java/com/zy/common/web/AuthController.java
+++ b/src/main/java/com/zy/common/web/AuthController.java
@@ -4,7 +4,10 @@
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.core.annotations.ManagerAuth;
-import com.core.common.*;
+import com.core.common.AesUtils;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.core.common.R;
 import com.core.exception.CoolException;
 import com.zy.common.CodeRes;
 import com.zy.common.entity.Parameter;
@@ -14,7 +17,6 @@
 import com.zy.common.properties.SystemProperties;
 import com.zy.common.utils.RandomValidateCodeUtil;
 import com.zy.system.entity.*;
-import com.zy.system.entity.license.LicenseVerify;
 import com.zy.system.service.*;
 import com.zy.system.timer.LicenseTimer;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -285,12 +287,12 @@
                 Resource resource = resourceService.selectOne(new EntityWrapper<Resource>().eq("id", dto.getTwo()).eq("level", 2));
                 if (!Cools.isEmpty(resource)) {
                     // 鏍¢獙涓婄骇鏉冮檺
-                    if (leaderId != null) {
-                        RoleResource roleResource = roleResourceService.selectOne(new EntityWrapper<RoleResource>().eq("role_id", leaderId).eq("resource_id", resource.getId()));
-                        if (null == roleResource) {
-                            throw new CoolException(resource.getName().concat("鏃犳硶鎺堟潈缁�").concat(role.getName()));
-                        }
-                    }
+//                    if (leaderId != null) {
+//                        RoleResource roleResource = roleResourceService.selectOne(new EntityWrapper<RoleResource>().eq("role_id", leaderId).eq("resource_id", resource.getId()));
+//                        if (null == roleResource) {
+//                            throw new CoolException(resource.getName().concat("鏃犳硶鎺堟潈缁�").concat(role.getName()));
+//                        }
+//                    }
                     RoleResource roleResource = new RoleResource();
                     roleResource.setRoleId(roleId);
                     roleResource.setResourceId(resource.getId());

--
Gitblit v1.9.1