From 46f7fdff7f7c7640e899b686031b8ccbc9c8b14c Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 27 May 2022 10:52:42 +0800
Subject: [PATCH] 1、资讯模糊匹配修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 2fe0c3a..53b2200 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -81,7 +81,10 @@
and account like concat('%',#{user.account},'%')
</if>
<if test="user.jurisdiction!=null and user.jurisdiction != ''">
- and jurisdiction like concat('%',#{user.jurisdiction},'%')
+ and (jurisdiction = #{user.jurisdiction} or workjurisdiction = #{user.jurisdiction})
+ </if>
+ <if test="user.workjurisdiction!=null and user.workjurisdiction != ''">
+ and workjurisdiction = #{user.workjurisdiction}
</if>
<if test="user.realName!=null and user.realName != ''">
and real_name like concat('%',#{user.realName},'%')
@@ -89,19 +92,22 @@
<if test="user.userType!=null and user.userType != ''">
and user_type = #{user.userType}
</if>
- <if test="deptIdList!=null and deptIdList.size>0">
- and id in (
- SELECT
- user_id
- FROM
- blade_user_dept
- WHERE
- dept_id IN
- <foreach collection="deptIdList" index="index" item="item" open="(" separator="," close=")">
- #{item}
- </foreach>
- )
+ <if test="user.deptId!=null and user.deptId != ''">
+ and (jurisdiction = #{user.deptId} or workjurisdiction = #{user.deptId})
</if>
+<!-- <if test="deptIdList!=null and deptIdList.size>0">-->
+<!-- and id in (-->
+<!-- SELECT-->
+<!-- user_id-->
+<!-- FROM-->
+<!-- blade_user_dept-->
+<!-- WHERE-->
+<!-- dept_id IN-->
+<!-- <foreach collection="deptIdList" index="index" item="item" open="(" separator="," close=")">-->
+<!-- #{item}-->
+<!-- </foreach>-->
+<!-- )-->
+<!-- </if>-->
ORDER BY id
</select>
@@ -191,11 +197,13 @@
<select id="getUser" resultMap="userResultMap">
SELECT
- *
+ r.role_name as rolename,
+ u.*
FROM
- blade_user
+ blade_user u
+ LEFT JOIN blade_role r ON u.role_id = r.id
WHERE
- tenant_id = #{param1} and account = #{param2} and password = #{param3} and is_deleted = 0
+ u.tenant_id = #{param1} and u.account = #{param2} and u.password = #{param3} and u.is_deleted = 0
</select>
<select id="exportUser" resultType="org.springblade.modules.system.excel.UserExcel">
--
Gitblit v1.9.3