refactor(X-Pack): 对权限体系进行重构-11

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 })
 }

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;
 }

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;
 }

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<MountedVO> 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<String> subOrgs();
+    List<String> subOrgs();*/
 }

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<RoleVO> byCurOrg(@RequestBody KeywordRequest request);

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<UserItem> byCurOrg(@RequestBody KeywordRequest request);
+    @GetMapping("/byCurOrg")
+    List<UserOptionVO> 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<UserItem> allUser(@RequestBody KeywordRequest request);
+
 
     @Hidden
     @PostMapping("/admin/bind")
@@ -213,9 +211,9 @@ public interface UserApi {
     @GetMapping("/defaultOrgAdmin")
     boolean defaultOrgAdmin();
 
-    @Hidden
+    /*@Hidden
     @PostMapping("/subOrgUser")
-    List<UserItem> subOrgUser(@RequestBody List<Long> oidList);
+    List<UserItem> subOrgUser(@RequestBody List<Long> oidList);*/
 
     List<Long> getRecipientUserIds(UserReciRequest request);
 

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;
+}

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;
 }