From 91080345b35f1909e22f173e802128a02316bd39 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 13 Apr 2026 13:52:06 +0800
Subject: [PATCH] fix:需要把角色是0的也查询出来
---
drone-service/drone-system/src/main/java/org/sxkj/system/controller/RoleController.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 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 519fdba..85c26ae 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
@@ -36,6 +36,7 @@
import org.springblade.core.tool.utils.Func;
import org.sxkj.system.cache.SysCache;
import org.sxkj.system.entity.Role;
+import org.sxkj.system.mapper.RoleMapper;
import org.sxkj.system.service.IRoleService;
import org.sxkj.system.cache.UserCache;
import org.sxkj.system.entity.User;
@@ -66,6 +67,7 @@
public class RoleController extends BladeController {
private final IRoleService roleService;
+ private final RoleMapper roleMapper;
/**
* 详情
@@ -90,13 +92,10 @@
@ApiOperationSupport(order = 2)
@ApiOperation(value = "列表", notes = "传入role")
public R<List<RoleVO>> list(@ApiIgnore @RequestParam Map<String, Object> role, BladeUser bladeUser) {
- QueryWrapper<Role> queryWrapper = Condition.getQueryWrapper(role, Role.class);
- // 不查询超级管理员角色
- // if (!AuthUtil.isAdministrator()) {
- // 使用 apply 手动指定类型转换
- queryWrapper.apply("id <> {0}::bigint", "1123598816738675201");
- // }
- List<Role> list = roleService.list(queryWrapper);
+ String roleName = (String) role.get("roleName");
+ String roleAlias = (String) role.get("roleAlias");
+ String sysType = (String) role.get("sysType");
+ List<Role> list = roleMapper.selectRoleList(roleName, roleAlias, sysType);
return R.data(RoleWrapper.build().listNodeVO(list));
}
--
Gitblit v1.9.3