From 4f3daf8adff218792d3ae1ef2b3a9c9357a4142e Mon Sep 17 00:00:00 2001
From: luofu <luofu@axzo.cn>
Date: Thu, 1 Aug 2024 14:54:14 +0800
Subject: [PATCH] =?UTF-8?q?feat(REQ-2488):=20=E6=9F=A5=E8=AF=A2=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E8=A7=92=E8=89=B2=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roleuser/req/ListRoleUserRelationParam.java      | 12 ++++++++++++
 .../impl/SaasRoleUserRelationServiceImpl.java        |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/req/ListRoleUserRelationParam.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/req/ListRoleUserRelationParam.java
index d901dd58..3c7ba434 100644
--- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/req/ListRoleUserRelationParam.java
+++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/req/ListRoleUserRelationParam.java
@@ -27,6 +27,18 @@ public class ListRoleUserRelationParam {
     @CriteriaField(field = "ouId", operator = Operator.EQ)
     private Long ouId;
 
+    /**
+     * 是否显示
+     */
+    @CriteriaField(ignore = true)
+    private Boolean isDisplay;
+
+    /**
+     * 是否启用
+     */
+    @CriteriaField(ignore = true)
+    private Boolean enabled;
+
     /**
      * 身份类型 1:工人 2:从业人员 3:班组长 4:运营人员 5:政务人员
      */
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java
index c16cb012..fdcfb4a2 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java
@@ -236,6 +236,8 @@ public class SaasRoleUserRelationServiceImpl extends ServiceImpl<SaasRoleUserRel
                 .featureIds(param.getFeatureIds())
                 .featureResourceTypes(param.getFeatureResourceTypes())
                 .needPermissionRelation(param.getNeedPermissionRelation())
+                .isDisplay(param.getIsDisplay())
+                .enabled(param.getEnabled())
                 .type(param.getType())
                 .terminal(param.getTerminal())
                 .needPermission(param.getNeedPermission())