From cc01607ad15fa69ad52bc0c81e8cfdc4b7effed8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 30 五月 2025 17:16:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

---
 server/service/src/main/resources/mappers/SystemRoleMapper.xml |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/server/service/src/main/resources/mappers/SystemRoleMapper.xml b/server/service/src/main/resources/mappers/SystemRoleMapper.xml
index 406267c..b115530 100644
--- a/server/service/src/main/resources/mappers/SystemRoleMapper.xml
+++ b/server/service/src/main/resources/mappers/SystemRoleMapper.xml
@@ -33,6 +33,9 @@
       <if test="dto.type != null">
         AND role.type = #{dto.type}
       </if>
+      <if test="dto.companyId != null">
+        AND role.COMPANY_ID = #{dto.companyId}
+      </if>
     </where>
     ${orderByClause}
   </select>

--
Gitblit v1.9.3