From 240a430cd12066a13e35e3da554b3b6afecdf512 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 03 十一月 2022 17:56:06 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml
index 8f02c2e..c62face 100644
--- a/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml
+++ b/ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml
@@ -77,18 +77,19 @@
LEFT JOIN ums_depart ud ON udm.depart_id = ud.id
LEFT JOIN ums_admin_role_relation uarr ON ua.id = uarr.admin_id
LEFT JOIN ums_role ur ON uarr.role_id = ur.id
- where 1=1
- <if test="umsAdmin.keyword !=null and umsAdmin.keyword =''">
- AND (ua.username LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%')
- or ua.nick_name LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%')
- or ua.mobile ua.nick_name LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%'))
- </if>
- <if test="umsAdmin.userType !=null and umsAdmin.userType >=0 ">
- AND ua.user_type = #{umsAdmin.userType}
- </if>
- <if test="umsAdmin.jobTitle !=null and umsAdmin.jobTitle=''">
- AND ua.job_title = #{umsAdmin.jobTitle}
- </if>
+ <where>
+ <if test="umsAdmin.keyword !=null and umsAdmin.keyword !=''">
+ AND (ua.username LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%')
+ or ua.nick_name LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%')
+ or ua.mobile LIKE concat('%',#{umsAdmin.keyword,jdbcType=VARCHAR},'%'))
+ </if>
+ <if test="umsAdmin.userType !=null and umsAdmin.userType >=0 ">
+ AND ua.user_type = #{umsAdmin.userType}
+ </if>
+ <if test="umsAdmin.jobTitle !=null and umsAdmin.keyword !=''">
+ AND ua.job_title = #{umsAdmin.jobTitle}
+ </if>
+ </where>
ORDER BY
ua.id DESC
</select>
--
Gitblit v1.8.0