From daa697719eb0ddfd170f1ab94c5422a4f5b93951 Mon Sep 17 00:00:00 2001 From: zhaoxiaohao <279049017@qq.com> Date: Fri, 18 Sep 2020 14:36:54 +0800 Subject: [PATCH] Merge branch 'dev' --- kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml | 6 ++++++ 1 files changed, 6 insertions(+), 0 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 a2c36bd..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 -- Gitblit v1.8.0