From c47f41291dc11d6d447d064cb9c54098b43bfb42 Mon Sep 17 00:00:00 2001 From: lilong Date: Fri, 11 Oct 2024 11:10:28 +0800 Subject: [PATCH] =?UTF-8?q?feat:(REQ-2750)=20=E8=A7=92=E8=89=B2tree?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0ouType?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/axzo/tyr/client/model/res/RoleTreeRes.java | 2 ++ .../cn/axzo/tyr/server/controller/role/SaasRoleController.java | 1 + 2 files changed, 3 insertions(+) diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/RoleTreeRes.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/RoleTreeRes.java index 069afd73..60d129ec 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/RoleTreeRes.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/res/RoleTreeRes.java @@ -61,4 +61,6 @@ public class RoleTreeRes { * id跟type拼接，因为前端组件所有节点的id不能重复 */ private String idStr; + + private Integer ouType; } diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleController.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleController.java index 3f0f5060..c73d1c28 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleController.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/role/SaasRoleController.java @@ -475,6 +475,7 @@ public class SaasRoleController implements TyrSaasRoleApi { .code(role.getRoleCode()) .workspaceId(role.getWorkspaceId()) .ouId(role.getOwnerOuId()) + .ouType(role.getProductUnitType()) .build(); }