From 8add59f7d3c7baa81d2bdd9712aaede9bf2cbb33 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 3 Jun 2026 15:54:58 +0800 Subject: [PATCH] =?UTF-8?q?refactor(X-Pack):=20=E5=AF=B9=E6=9D=83=E9=99=90?= =?UTF-8?q?=E4=BD=93=E7=B3=BB=E8=BF=9B=E8=A1=8C=E9=87=8D=E6=9E=84-11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/api/auth.ts | 9 +++++---- .../auth/dto/BasePermissionRequest.java | 2 +- .../auth/dto/BusiResourceRequest.java | 2 +- .../api/permissions/org/api/OrgApi.java | 8 ++++---- .../api/permissions/role/api/RoleApi.java | 4 ---- .../api/permissions/user/api/UserApi.java | 12 +++++------- .../api/permissions/user/bo/UserOrgItem.java | 19 +++++++++++++++++++ .../api/permissions/user/vo/UserGridVO.java | 3 +++ 8 files changed, 38 insertions(+), 21 deletions(-) create mode 100644 sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/bo/UserOrgItem.java diff --git a/core/core-frontend/src/api/auth.ts b/core/core-frontend/src/api/auth.ts index 3188976dd3..9f673268b2 100644 --- a/core/core-frontend/src/api/auth.ts +++ b/core/core-frontend/src/api/auth.ts @@ -1,13 +1,14 @@ import request from '@/config/axios' -export const queryUserApi = data => request.post({ url: '/user/byCurOrg', data }) -export const queryUserOptionsApi = () => request.get({ url: '/user/query' }) +export const queryUserApi = (isSystem?: boolean) => + isSystem ? request.get({ url: '/user/query' }) : request.get({ url: '/user/byCurOrg' }) + export const queryRoleApi = data => request.post({ url: '/role/byCurOrg', data }) -export const resourceTreeApi = (flag: string, isSystem?: boolean) => { +export const resourceTreeApi = (flag: string, system?: boolean) => { const param = { flag, - isSystem: !!isSystem + system: !!system } return request.post({ url: '/auth/busiResource', data: param }) } diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BasePermissionRequest.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BasePermissionRequest.java index 29084257e9..dec141060a 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BasePermissionRequest.java +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BasePermissionRequest.java @@ -19,5 +19,5 @@ public class BasePermissionRequest implements Serializable { @Schema(description = "资源类型", requiredMode = Schema.RequiredMode.REQUIRED) private String flag; - private boolean isSystem; + private boolean system; } diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiResourceRequest.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiResourceRequest.java index 6efed3de78..1c96c7d9ed 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiResourceRequest.java +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/auth/dto/BusiResourceRequest.java @@ -16,5 +16,5 @@ public class BusiResourceRequest implements Serializable { private String flag; @Schema(description = "是否系统级查询") - private boolean isSystem; + private boolean system; } diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/api/OrgApi.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/api/OrgApi.java index c98ed3ea41..8896277f3a 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/api/OrgApi.java +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/org/api/OrgApi.java @@ -53,7 +53,7 @@ public interface OrgApi { @DePermit({"m:read", "#p0+':manage'"}) void delete(@PathVariable("id") Long id); - @Operation(summary = "查询权限内组织树") + /*@Operation(summary = "查询权限内组织树") @PostMapping("/mounted") List mounted(@RequestBody KeywordRequest request); @@ -64,12 +64,12 @@ public interface OrgApi { @Operation(summary = "", hidden = true) @GetMapping("/resourceExist/{oid}") boolean resourceExist(@PathVariable("oid") Long oid); - +*/ @Operation(hidden = true) @GetMapping("/detail/{oid}") OrgDetailVO detail(@PathVariable("oid") Long oid); - @Operation(hidden = true) + /* @Operation(hidden = true) @GetMapping("/subOrgs") - List subOrgs(); + List subOrgs();*/ } diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/api/RoleApi.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/api/RoleApi.java index c2822e4958..57f45e935b 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/api/RoleApi.java +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/role/api/RoleApi.java @@ -72,10 +72,6 @@ public interface RoleApi { void delete(@PathVariable("rid") Long rid); - @Operation(summary = "复制", hidden = true) - @PostMapping("/copy") - void copy(@RequestBody RoleCopyRequest request); - @Operation(summary = "查询组织内角色") @PostMapping("/byCurOrg") List byCurOrg(@RequestBody KeywordRequest request); diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java index 2bf63f2085..7bd204335b 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/api/UserApi.java @@ -122,8 +122,8 @@ public interface UserApi { CurUserVO info(); @Operation(summary = "查询当前组织内用户") - @PostMapping("/byCurOrg") - List byCurOrg(@RequestBody KeywordRequest request); + @GetMapping("/byCurOrg") + List byCurOrg(); @Operation(summary = "用户数量", hidden = true) @Hidden @@ -181,9 +181,7 @@ public interface UserApi { @GetMapping("/queryByAccount/{account}") CurUserVO queryByAccount(@PathVariable("account") String account); - @Hidden - @PostMapping("/all") - List allUser(@RequestBody KeywordRequest request); + @Hidden @PostMapping("/admin/bind") @@ -213,9 +211,9 @@ public interface UserApi { @GetMapping("/defaultOrgAdmin") boolean defaultOrgAdmin(); - @Hidden + /*@Hidden @PostMapping("/subOrgUser") - List subOrgUser(@RequestBody List oidList); + List subOrgUser(@RequestBody List oidList);*/ List getRecipientUserIds(UserReciRequest request); diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/bo/UserOrgItem.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/bo/UserOrgItem.java new file mode 100644 index 0000000000..88da54ca8f --- /dev/null +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/bo/UserOrgItem.java @@ -0,0 +1,19 @@ +package io.dataease.api.permissions.user.bo; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class UserOrgItem implements Serializable { + + @Schema(description = "ID") + @JsonSerialize(using= ToStringSerializer.class) + private Long id; + + @Schema(description = "名称") + private String name; +} diff --git a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserGridVO.java b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserGridVO.java index 7c59307939..0905cdf35a 100644 --- a/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserGridVO.java +++ b/sdk/api/api-permissions/src/main/java/io/dataease/api/permissions/user/vo/UserGridVO.java @@ -2,6 +2,7 @@ package io.dataease.api.permissions.user.vo; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.dataease.api.permissions.user.bo.UserOrgItem; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -34,4 +35,6 @@ public class UserGridVO { private String sysVariable; @Schema(description = "用户来源") private Integer origin; + @Schema(description = "组织") + private UserOrgItem orgItem; }