From f8ab5663ef7220f8adc0fd8fcbd7d0cf84c6d77d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 02 八月 2021 12:15:14 +0800
Subject: [PATCH] update 日常字符串校验 统一重构到 StringUtils 便于维护扩展
---
ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 236ae20..5e11278 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -148,16 +148,16 @@
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id
- where u.del_flag = '0' and r.role_id = #{roleId}
- <if test="userName != null and userName != ''">
- AND u.user_name like concat('%', #{userName}, '%')
+ where u.del_flag = '0' and r.role_id = #{user.roleId}
+ <if test="user.userName != null and user.userName != ''">
+ AND u.user_name like concat('%', #{user.userName}, '%')
</if>
- <if test="phonenumber != null and phonenumber != ''">
- AND u.phonenumber like concat('%', #{phonenumber}, '%')
+ <if test="user.phonenumber != null and user.phonenumber != ''">
+ AND u.phonenumber like concat('%', #{user.phonenumber}, '%')
</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
- <if test="params.dataScope != null and params.dataScope != ''">
- AND ( ${params.dataScope} )
+ <if test="user.params.dataScope != null and user.params.dataScope != ''">
+ AND ( ${user.params.dataScope} )
</if>
</select>
@@ -167,17 +167,17 @@
left join sys_dept d on u.dept_id = d.dept_id
left join sys_user_role ur on u.user_id = ur.user_id
left join sys_role r on r.role_id = ur.role_id
- where u.del_flag = '0' and (r.role_id != #{roleId} or r.role_id IS NULL)
- and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{roleId})
- <if test="userName != null and userName != ''">
- AND u.user_name like concat('%', #{userName}, '%')
+ where u.del_flag = '0' and (r.role_id != #{user.roleId} or r.role_id IS NULL)
+ and u.user_id not in (select u.user_id from sys_user u inner join sys_user_role ur on u.user_id = ur.user_id and ur.role_id = #{user.roleId})
+ <if test="user.userName != null and user.userName != ''">
+ AND u.user_name like concat('%', #{user.userName}, '%')
</if>
- <if test="phonenumber != null and phonenumber != ''">
- AND u.phonenumber like concat('%', #{phonenumber}, '%')
+ <if test="user.phonenumber != null and user.phonenumber != ''">
+ AND u.phonenumber like concat('%', #{user.phonenumber}, '%')
</if>
<!-- 鏁版嵁鑼冨洿杩囨护 -->
- <if test="params.dataScope != null and params.dataScope != ''">
- AND ( ${params.dataScope} )
+ <if test="user.params.dataScope != null and user.params.dataScope != ''">
+ AND ( ${user.params.dataScope} )
</if>
</select>
--
Gitblit v1.9.3