From 2418543dfc6c61fa5091e242042a7d7635f6c7c5 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 02 Apr 2026 14:27:16 +0800
Subject: [PATCH] opt: sql改造其他模块改造9
---
drone-service/drone-system/src/main/java/org/sxkj/system/controller/RoleController.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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..519fdba 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
@@ -84,16 +84,18 @@
@GetMapping("/list")
@ApiImplicitParams({
@ApiImplicitParam(name = "roleName", value = "参数名称", paramType = "query", dataType = "string"),
- @ApiImplicitParam(name = "roleAlias", value = "角色别名", paramType = "query", dataType = "string")
+ @ApiImplicitParam(name = "roleAlias", value = "角色别名", paramType = "query", dataType = "string"),
+ @ApiImplicitParam(name = "sysType", value = "系统编码 5：反无 6：工单", paramType = "query", dataType = "string")
})
@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()) {
- queryWrapper.ne("id","1123598816738675201");
- }
+ // if (!AuthUtil.isAdministrator()) {
+ // 使用 apply 手动指定类型转换
+ queryWrapper.apply("id <> {0}::bigint", "1123598816738675201");
+ // }
List<Role> list = roleService.list(queryWrapper);
return R.data(RoleWrapper.build().listNodeVO(list));
}
@@ -104,8 +106,8 @@
@GetMapping("/tree")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "树形结构", notes = "树形结构")
- public R<List<RoleVO>> tree(String tenantId, BladeUser bladeUser) {
- List<RoleVO> tree = roleService.tree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()));
+ public R<List<RoleVO>> tree(@RequestParam(value = "tenantId") String tenantId, @RequestParam(value = "sysType", required = false) String sysType, BladeUser bladeUser) {
+ List<RoleVO> tree = roleService.tree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), sysType);
return R.data(tree);
}
@@ -115,9 +117,9 @@
@GetMapping("/tree-by-id")
@ApiOperationSupport(order = 4)
@ApiOperation(value = "树形结构", notes = "树形结构")
- public R<List<RoleVO>> treeById(Long roleId, BladeUser bladeUser) {
+ public R<List<RoleVO>> treeById(Long roleId, @RequestParam(value = "sysType", required = false) String sysType, BladeUser bladeUser) {
Role role = SysCache.getRole(roleId);
- List<RoleVO> tree = roleService.tree(Func.notNull(role) ? role.getTenantId() : bladeUser.getTenantId());
+ List<RoleVO> tree = roleService.tree(Func.notNull(role) ? role.getTenantId() : bladeUser.getTenantId(), sysType);
return R.data(tree);
}
@@ -180,6 +182,7 @@
/**
* 自定义列表（只获取当前角色下级角色）
+ *
* @param roleParam
* @return
*/
--
Gitblit v1.9.3