From eafda003f1b94923d106c272d519621484ce1f51 Mon Sep 17 00:00:00 2001
From: lilong <lilong@axzo.cn>
Date: Tue, 16 Apr 2024 19:05:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:(REQ-2227)=20=E4=BF=AE=E6=94=B9=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2tree=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/axzo/tyr/server/service/RoleService.java | 4 ++--
 tyr-server/src/main/resources/logback-spring.xml              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/RoleService.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/RoleService.java
index 540f39e7..fc8890e0 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/RoleService.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/RoleService.java
@@ -144,10 +144,10 @@ public interface RoleService extends IService<SaasRole> {
         @CriteriaField(field = "roleCode", operator = Operator.EQ)
         private String roleCode;
 
-        @CriteriaField(field = "workspaceId", operator = Operator.EQ)
+        @CriteriaField(field = "workspaceId", operator = Operator.IN)
         private List<Long> workspaceIds;
 
-        @CriteriaField(field = "ownerOuId", operator = Operator.EQ)
+        @CriteriaField(field = "ownerOuId", operator = Operator.IN)
         private List<Long> ouIds;
 
         @CriteriaField(ignore = true)
diff --git a/tyr-server/src/main/resources/logback-spring.xml b/tyr-server/src/main/resources/logback-spring.xml
index 977ff74a..922ff245 100644
--- a/tyr-server/src/main/resources/logback-spring.xml
+++ b/tyr-server/src/main/resources/logback-spring.xml
@@ -4,7 +4,7 @@
     <!-- 导入安心筑全局日志配置 -->
     <include resource="logback/logback-axzo.xml" />
     <!-- 覆盖开发环境日志配置 -->
-    <springProfile name="local,dev,test">
+    <springProfile name="local,dev">
         <logger name="cn.axzo" level="DEBUG" />
     </springProfile>
 </configuration>
\ No newline at end of file