From 9a18aa1ec467a6bfbdf11f957f5c40e6326284cd Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Tue, 15 Sep 2020 11:53:33 +0800
Subject: [PATCH] 获取到期时间的接口，添加判断条件
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 fd8c3db..07d25a1 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
@@ -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>
@@ -147,6 +150,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
@@ -171,11 +177,12 @@
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.is_del=0 and dc.enabled=1 and dc.hospital_id=1 and dc.department_id=1 and us.enabled=1
+ 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,
@@ -190,14 +197,14 @@
us.username,
us.default_auth,
us.enabled,
- roleuser.role_id,
+-- 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 dc.hospital_id=1 and dc.department_id=1 and us.enabled=1
+ 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