From 08609348883df8986e039566551046e0a1bf61d7 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:54:35 +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
---
.../src/main/resources/mapper/system/SysDeptMapper.xml | 4 +++-
.../src/main/resources/mapper/system/SysRoleMapper.xml | 8 ++++++--
.../src/main/resources/mapper/system/SysUserMapper.xml | 8 ++++++--
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 7db86165..21f68541 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -40,7 +40,9 @@
AND status = #{status}
- ${params.dataScope}
+
+ AND ( ${params.dataScope} )
+
order by d.parent_id, d.order_num
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
index 5440f4fb..1a542f83 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -58,7 +58,9 @@
and date_format(r.create_time,'%y%m%d') <= date_format(#{role.params.endTime},'%y%m%d')
- ${role.params.dataScope}
+
+ AND ( ${role.params.dataScope} )
+
order by r.role_sort
@@ -81,7 +83,9 @@
and date_format(r.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d')
- ${params.dataScope}
+
+ AND ( ${params.dataScope} )
+
order by r.role_sort
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 741600fc..df59332b 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) ))
- ${user.params.dataScope}
+
+ AND ( ${user.params.dataScope} )
+