From f14deee7baaf82e7aad6fc81a2509ba88e869afd Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Mon, 02 Nov 2020 15:30:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml
index 92c1dac..f565c82 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml
@@ -6,7 +6,7 @@
<where>
t.is_del=0
<if test="u.id != null and u.id != ''">
- and t.id like concat('%', #{u.id}, '%')
+ and t.id = #{u.id}
</if>
<if test="u.username != null and u.username != ''">
and t.username like concat('%', #{u.username}, '%')
@@ -90,6 +90,7 @@
LEFT JOIN sys_role ROLE ON RU.role_id = ROLE.id
WHERE
USERS.is_del = 0
+ and USERS.enabled = 1
<if test="type == 0">
AND ROLE.`code` IN (
'salemanager',
@@ -150,6 +151,9 @@
left JOIN sys_hospital syshos on sysdoctor.hospital_id=syshos.id
left JOIN sys_department sysdep on sysdoctor.department_id=sysdep.id
where sysuser.id=#{userId}
+ and sysuser.is_del=0 and sysuser.enabled=1
+ and syshos.is_del=0 and syshos.enabled=1
+ and sysdep.is_del=0 and sysdep.enabled=1
</select>
<select id="hospitalDoctorList" parameterType="long" resultType="com.kidgrow.usercenter.vo.HospitalDoctorListVo">
SELECT
--
Gitblit v1.8.0