From 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 09 Feb 2026 11:00:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-system/src/main/java/org/sxkj/system/controller/RoleController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/controller/RoleController.java b/drone-service/drone-system/src/main/java/org/sxkj/system/controller/RoleController.java
index 533a981..8489b0d 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/controller/RoleController.java
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/controller/RoleController.java
@@ -91,9 +91,9 @@
public R<List<RoleVO>> list(@ApiIgnore @RequestParam Map<String, Object> role, BladeUser bladeUser) {
QueryWrapper<Role> queryWrapper = Condition.getQueryWrapper(role, Role.class);
// 不查询超级管理员角色
- if (!AuthUtil.isAdministrator()) {
+ // if (!AuthUtil.isAdministrator()) {
queryWrapper.ne("id","1123598816738675201");
- }
+ // }
List<Role> list = roleService.list(queryWrapper);
return R.data(RoleWrapper.build().listNodeVO(list));
}
--
Gitblit v1.9.3