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 | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 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 6b49ba5..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}, '%')
@@ -36,6 +36,9 @@
</sql>
<sql id="where_map">
<where>
+ <if test="u.isDel != null">
+ and t.is_del = #{u.isDel}
+ </if>
<if test="u.id != null and u.id != ''">
and t.id like concat('%', #{u.id}, '%')
</if>
@@ -87,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',
@@ -102,7 +106,7 @@
<select id="findDoctorUserAllData" parameterType="long" resultType="com.kidgrow.common.model.DoctorUserAll">
SELECT sysuser.id,
sysdoctor.doctor_name,
- sysdoctor.doctor_id,
+ sysdoctor.id doctor_Id,
sysdoctor.doctor_ccie,
sysdoctor.doctor_tel,
sysdoctor.doctor_rank,
@@ -147,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
@@ -162,11 +169,43 @@
dc.doctor_state,
us.mobile,
us.username,
- us.is_default_auth,
- us.enabled
+ us.default_auth,
+ us.enabled,
+ roleuser.role_id,
+ dc.is_del
FROM
sys_doctor dc
LEFT JOIN sys_user us ON dc.user_id = us.id
- where dc.is_del=0 and dc.hospital_id=#{hospitalId} and dc.department_id=#{departmentId}
+ LEFT JOIN sys_role_user roleuser
+ ON roleuser.user_id=us.id
+ where dc.is_del=0 and dc.enabled=1 and us.enabled=1
+ and dc.hospital_id=#{hospitalId} and dc.department_id=#{departmentId} and (role_id=#{roleId1} or role_id=#{roleId2})
+ </select>
+ <select id="hospitalDoctorListAndDel" parameterType="long" resultType="com.kidgrow.usercenter.vo.HospitalDoctorListVo">
+ SELECT
+ distinct
+ dc.create_time,
+ dc.department_name,
+ dc.hospital_name,
+ dc.doctor_name,
+ dc.doctor_rank,
+ dc.doctor_tel,
+ dc.id,
+ dc.user_id,
+ dc.is_admin_user,
+ dc.doctor_state,
+ us.mobile,
+ us.username,
+ us.default_auth,
+ us.enabled,
+-- roleuser.role_id,
+ dc.is_del
+ FROM
+ sys_doctor dc
+ LEFT JOIN sys_user us ON dc.user_id = us.id
+ LEFT JOIN sys_role_user roleuser
+ ON roleuser.user_id=us.id
+ where dc.enabled=1 and us.enabled=1
+ and dc.hospital_id=#{hospitalId} and dc.department_id=#{departmentId} and (role_id=#{roleId1} or role_id=#{roleId2})
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0