From 4fdcdedf312418cf7731b8af7d520532eabbb794 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E6=95=8F?= Date: Fri, 22 Nov 2024 10:07:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:(REQ-2993)=20=E6=95=B0=E6=8D=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=E8=B0=83=E6=95=B4=20step3=20=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=E6=9C=AC=E6=9C=9F=E5=92=B1=E4=B8=8D=E6=94=AF=E6=8C=81=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E7=9A=84=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E9=A1=B9=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1、屏蔽本期咱不支持的数据权限的枚举项返回 --- .../common/enums/AttrPermissionEnum.java | 23 +++++++++++-------- .../common/enums/RowPermissionEnum.java | 19 ++++++++------- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/common/enums/AttrPermissionEnum.java b/tyr-api/src/main/java/cn/axzo/tyr/client/common/enums/AttrPermissionEnum.java index 575966e7..043d995c 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/common/enums/AttrPermissionEnum.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/common/enums/AttrPermissionEnum.java @@ -9,31 +9,34 @@ import java.util.stream.Collectors; @Getter @AllArgsConstructor -public enum AttrPermissionEnum{ - SELF_ONLY(1, "本人数据", true, true), - SELF_SUBORDINATE(2, "下属数据", true, true), - DEPARTMENT_ONLY(3, "本部门数据", true, true), +public enum AttrPermissionEnum { + SELF_ONLY(1, "本人数据", false, true, true), + SELF_SUBORDINATE(2, "下属数据", false, true, true), + DEPARTMENT_ONLY(3, "本部门数据", false, true, true), - DEPARTMENT_SUBORDINATE(4, "直属下级部门数据", true, true), + DEPARTMENT_SUBORDINATE(4, "直属下级部门数据", false, true, true), - UNIT_ONLY(5, "本单位数据", true, true), + UNIT_ONLY(5, "本单位数据", true, true, true), - UNIT_DIRECT_SUBORDINATE(6, "直属下级单位数据", false, true), + UNIT_DIRECT_SUBORDINATE(6, "直属下级单位数据", true, false, true), - UNIT_COOPERATE_SUBORDINATE(7, "下级单位数据", false, true), + UNIT_COOPERATE_SUBORDINATE(7, "下级单位数据", false, false, true), - WORKSPACE(8, "本项目部数据", false, true), + WORKSPACE(8, "本项目部数据", true, false, true), - EQUAL_TO_ROW(999, "同行级数据权限", true, true), + EQUAL_TO_ROW(999, "同行级数据权限", true, true, true), ; private final Integer value; private final String desc; + private final Boolean enabled; private final Boolean supportedNotWorkspace; private final Boolean supportedWorkspace; private static final List ROW_PERMISSION_FOR_WORKSPACE = Arrays.stream(AttrPermissionEnum.values()) + .filter(rp -> rp.enabled) .filter(rp -> rp.supportedWorkspace).collect(Collectors.toList()); private static final List ROW_PERMISSION_FOR_NOT_WORKSPACE = Arrays.stream(AttrPermissionEnum.values()) + .filter(rp -> rp.enabled) .filter(rp -> rp.supportedNotWorkspace).collect(Collectors.toList()); public static List listAttrPermissionForWorkspace() { diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/common/enums/RowPermissionEnum.java b/tyr-api/src/main/java/cn/axzo/tyr/client/common/enums/RowPermissionEnum.java index 56f786cb..c2c974ed 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/common/enums/RowPermissionEnum.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/common/enums/RowPermissionEnum.java @@ -13,28 +13,31 @@ import java.util.stream.Collectors; @Getter @AllArgsConstructor public enum RowPermissionEnum { - SELF_ONLY(1, "本人数据", true, true), - SELF_SUBORDINATE(2, "下属数据", true, true), - DEPARTMENT_ONLY(3, "本部门数据", true, true), + SELF_ONLY(1, "本人数据", false, true, true), + SELF_SUBORDINATE(2, "下属数据", false, true, true), + DEPARTMENT_ONLY(3, "本部门数据", false, true, true), - DEPARTMENT_SUBORDINATE(4, "直属下级部门数据", true, true), + DEPARTMENT_SUBORDINATE(4, "直属下级部门数据", false, true, true), - UNIT_ONLY(5, "本单位数据", true, true), + UNIT_ONLY(5, "本单位数据", true, true, true), - UNIT_DIRECT_SUBORDINATE(6, "直属下级单位数据", false, true), + UNIT_DIRECT_SUBORDINATE(6, "直属下级单位数据", true, false, true), - UNIT_COOPERATE_SUBORDINATE(7, "下级单位数据", false, true), + UNIT_COOPERATE_SUBORDINATE(7, "下级单位数据", false, false, true), - WORKSPACE(8, "本项目部数据", false, true); + WORKSPACE(8, "本项目部数据", true, false, true); private final Integer value; private final String desc; + private final Boolean enabled; private final Boolean supportedNotWorkspace; private final Boolean supportedWorkspace; private static final List ROW_PERMISSION_FOR_WORKSPACE = Arrays.stream(RowPermissionEnum.values()) + .filter(rp -> rp.enabled) .filter(rp -> rp.supportedWorkspace).collect(Collectors.toList()); private static final List ROW_PERMISSION_FOR_NOT_WORKSPACE = Arrays.stream(RowPermissionEnum.values()) + .filter(rp -> rp.enabled) .filter(rp -> rp.supportedNotWorkspace).collect(Collectors.toList()); public static List listRowPermissionForWorkspace() {