From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/mapper/RoleMapper.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/mapper/RoleMapper.xml b/src/main/java/org/springblade/modules/system/mapper/RoleMapper.xml
index 2da5a36..7319078 100644
--- a/src/main/java/org/springblade/modules/system/mapper/RoleMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/RoleMapper.xml
@@ -30,7 +30,10 @@
             and tenant_id = #{param1}
         </if>
         <if test="param2!=null">
-            and role_alias &lt;&gt; #{param2}
+            and dept_id = #{param2}
+        </if>
+        <if test="param3!=null">
+            and role_alias &lt;&gt; #{param3}
         </if>
     </select>
 

--
Gitblit v1.9.3