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

houruijun

2020-07-22 3c470b15b952b86c1e38cb9634190a12ccf3d38d

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

@@ -155,7 +155,73 @@
            <if test="p.hospitalName != null and p.hospitalName !=''">
                and hospital_name LIKE concat('%',#{p.hospitalName},'%')
            </if>
            <include refid="com.kidgrow.usercenter.mapper.SysRoleOrganizationMapper.Role_Organization"></include>
            <if test="p.roleOrg != null and p.roleOrg.size>0">

                <foreach item="item" collection="p.roleOrg" index="">
                    <foreach item="itemto" collection="item" index="inx">

                        <choose>
                            <when test="inx == 1">
                                <if test="itemto.flag">
                                    and 1=1
                                </if>
                                <if test="!itemto.flag">
                                    or (1=1 and HOS.is_del = 0 and HOS.enabled=1)
                                </if>
                            </when>
                            <when test="inx==2">
                                <if test="itemto.flag">
                                    AND
                                    <foreach item="itemtoto" collection="itemto.object" separator="or" open="(" close=")"
                                             index="">
                                        create_user_org_code = #{itemtoto.orgCode}
                                    </foreach>
                                </if>
                                <if test="!itemto.flag">
                                    or (
                                    <foreach item="itemtoto" collection="itemto.object" separator="or" open="(" close=")"
                                             index="">
                                        create_user_org_code = #{itemtoto.orgCode}
                                    </foreach>  and HOS.is_del = 0 and HOS.enabled=1
                                    )
                                </if>
                            </when>
                            <when test="inx == 3">
                                <if test="itemto.flag">
                                    AND
                                    create_user_org_code = #{itemto.object}
                                </if>
                                <if test="!itemto.flag">
                                    or (create_user_org_code = #{itemto.object} and HOS.is_del = 0 and HOS.enabled=1)
                                </if>
                            </when>
                            <when test="inx == 4">
                                <if test="itemto.flag">
                                    AND
                                    create_user_org_code like '${itemto.object}%'
                                </if>
                                <if test="!itemto.flag">
                                    or (create_user_org_code like '${itemto.object}%' and HOS.is_del = 0 and HOS.enabled=1)
                                </if>
                            </when>
                            <when test="inx == 5">
                                <if test="itemto.flag">
                                    AND
                                    HOS.create_user_id = #{itemto.object}
                                </if>
                                <if test="!itemto.flag">
                                    or (HOS.create_user_id = #{itemto.object} and HOS.is_del = 0 and HOS.enabled=1)
                                </if>
                            </when>
                            <otherwise>
                                AND id is null
                            </otherwise>
                        </choose>

                    </foreach>
                </foreach>
            </if>
<!--                        <include refid="com.kidgrow.usercenter.mapper.SysRoleOrganizationMapper.Role_Organization"></include>-->
        </where>
    </sql>
    <select id="findHospitalList" resultType="com.kidgrow.usercenter.vo.HospitalListVo">
@@ -183,10 +249,10 @@
        HOS.area_code,
        HOS.create_time
        FROM
   sys_department DEP
   LEFT JOIN sys_hospital HOS ON DEP.hospital_id = HOS.id
        sys_department DEP
        LEFT JOIN sys_hospital HOS ON DEP.hospital_id = HOS.id
        <include refid="whereList"/>
        order by create_time  desc
        order by create_time desc
    </select>
    <select id="findByName" resultType="com.kidgrow.usercenter.model.SysHospital">
        select id,