From b7bd67b4cb9be191a2af45b02dd45d8cfba2efc3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Sat, 29 May 2021 18:41:32 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90sql=20=E8=A7=A3=E5=86=B3MP=20apply=E6=B3=A8?=
 =?UTF-8?q?=E5=85=A5=E9=99=84=E5=B8=A6=20AND=20=E8=AF=AD=E6=B3=95=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/framework/aspectj/DataScopeAspect.java     | 2 +-
 .../src/main/resources/mapper/system/SysDeptMapper.xml        | 2 +-
 .../src/main/resources/mapper/system/SysRoleMapper.xml        | 4 ++--
 .../src/main/resources/mapper/system/SysUserMapper.xml        | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
index ce23af09..0a766e53 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
@@ -145,7 +145,7 @@ public class DataScopeAspect
 
         if (StrUtil.isNotBlank(sqlString.toString()))
         {
-			putDataScope(joinPoint, " AND (" + sqlString.substring(4) + ")");
+			putDataScope(joinPoint, sqlString.substring(4));
 		}
     }
 
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 7db86165..433563e3 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -40,7 +40,7 @@
             AND status = #{status}
         </if>
         <!-- 数据范围过滤 -->
-        ${params.dataScope}
+        AND ( ${params.dataScope} )
         order by d.parent_id, d.order_num
     </select>
 
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
index 2e7162f3..b96b95d8 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -81,7 +81,7 @@
             and date_format(r.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
         </if>
         <!-- 数据范围过滤 -->
-        ${params.dataScope}
+        AND ( ${params.dataScope} )
         order by r.role_sort
     </select>
 
@@ -103,4 +103,4 @@
         WHERE r.del_flag = '0' and u.user_name = #{userName}
     </select>
 
-</mapper> 
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 1135dee9..8332ea9d 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -135,7 +135,7 @@
             ancestors) ))
         </if>
         <!-- 数据范围过滤 -->
-        ${params.dataScope}
+        AND ( ${params.dataScope} )
     </select>
 
     <select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
@@ -149,4 +149,4 @@
     </select>
 
 
-</mapper> 
\ No newline at end of file
+</mapper>