From 02dcc4c9d043c44d0fa88490904046008fcf4afc Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Wed, 15 Jul 2020 09:54:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDoctorMapper.xml | 62 +++++++++---------------------
1 files changed, 19 insertions(+), 43 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDoctorMapper.xml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDoctorMapper.xml
index ff9e67e..26d1d51 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDoctorMapper.xml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDoctorMapper.xml
@@ -22,7 +22,7 @@
and hospital_id = #{p.hospitalId}
</if>
<if test="p.hospitalName != null and p.hospitalName !=''">
- and hospital_name = #{p.hospitalName}
+ and hospital_name like '%${p.hospitalName}%'
</if>
<if test="p.departmentId != null and p.departmentId !=''">
and department_id = #{p.departmentId}
@@ -37,7 +37,7 @@
and doctor_logo = #{p.doctorLogo}
</if>
<if test="p.doctorTel != null and p.doctorTel !=''">
- and doctor_tel like '%${p.doctorTel}%'
+ and doctor_tel like concat('%',#{p.doctorTel},'%')
</if>
<if test="p.doctorRankId != null and p.doctorRankId !=''">
and doctor_rank_id = #{p.doctorRankId}
@@ -90,47 +90,7 @@
<if test="p.updateTime != null and p.updateTime !=''">
and update_time = #{p.updateTime}
</if>
- <if test="p.likes != null and p.likes.size>0">
-
- <foreach item="item" collection="p.likes" index="">
- <foreach item="itemto" collection="item" index="inx">
-
-
- <choose>
- <when test="inx.type == 1"></when>
-
- <when test="inx.type==2">
- AND
- <foreach item="itemtoto" collection="itemto" separator="or" open="(" close=")" index="">
- create_user_org_code like '${itemtoto.orgCode}%'
- </foreach>
- </when>
- <when test="inx.type == 3">
- AND
- <foreach item="itemtoto" collection="itemto" separator="or" open="(" close=")" index="">
- create_user_org_code = #{itemtoto.orgCode}
- </foreach>
- </when>
- <when test="inx.type == 4">
- AND
- <foreach item="itemtoto" collection="itemto" separator="or" open="(" close=")" index="">
- create_user_org_code like '${itemtoto.orgCode}%'
- </foreach>
- </when>
- <when test="inx.type == 5">
- AND
- <foreach item="itemtoto" collection="itemto" separator="or" open="(" close=")" index="">
- create_user_id = #{itemtoto.orgCode}
- </foreach>
- </when>
- <otherwise>
- AND id is null
- </otherwise>
- </choose>
-
- </foreach>
- </foreach>
- </if>
+ <include refid="com.kidgrow.usercenter.mapper.SysRoleOrganizationMapper.Role_Organization"/>
</where>
</sql>
@@ -152,4 +112,20 @@
<include refid="where"/>
order by id desc
</select>
+
+ <select id="userIsAdmin" parameterType="string" resultType="com.kidgrow.usercenter.model.SysDoctor">
+ SELECT
+ is_admin_user
+ FROM
+ sys_doctor
+ WHERE
+ user_id IN (
+ SELECT
+ id
+ FROM
+ sys_user
+ WHERE
+ username = #{userName}
+ OR mobile = #{userName})
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0