Merge remote-tracking branch 'origin/dev' into dev

houruijun

2020-08-20 e4ac82fd428335020eb6522fc642b4fd91eb86f0

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml

@@ -171,11 +171,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 +191,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>