From a8c1d02ee14a3aa01dc02f496a9e4a61b6abdf99 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 17 六月 2021 18:15:34 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 1135dee..df59332 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -106,7 +106,9 @@
ancestors) ))
</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${user.params.dataScope}
+ <if test="user.params.dataScope != null and user.params.dataScope != ''">
+ AND ( ${user.params.dataScope} )
+ </if>
</select>
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
@@ -135,7 +137,9 @@
ancestors) ))
</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
- ${params.dataScope}
+ <if test="params.dataScope != null and params.dataScope != ''">
+ AND ( ${params.dataScope} )
+ </if>
</select>
<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
@@ -149,4 +153,4 @@
</select>
-</mapper>
\ No newline at end of file
+</mapper>
--
Gitblit v1.9.3