From 4c19ddd36bdfb43b5ef4e8df3c9a98cd4d356d6c Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 26 May 2022 10:55:04 +0800
Subject: [PATCH] 1、资讯模糊匹配修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 65a5eb5..754b61d 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -191,11 +191,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">
@@ -391,7 +393,7 @@
blade_user bu
LEFT JOIN blade_dept dept ON substring_index( substring_index( bu.dept_id, ',', 3 ), ',',- 1 ) = dept.id
WHERE
- bu.jurisdiction = "1415620815526883329"
+ bu.jurisdiction = #{xid}
<if test="index == 1">
AND dept.id = '1424615693403414529'
</if>
@@ -452,7 +454,10 @@
</select>
<update id="updateAcc">
- update blade_user set stype=#{stype} where account=#{account}
+ update blade_user set stype=#{stype},firstlogin = "1" where account=#{account}
+ </update>
+ <update id="firstLogin">
+ update blade_user set firstlogin = "0" where id=#{id}
</update>
<delete id="delete">
--
Gitblit v1.9.3