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

zengh

2021-01-28 d80ca95c3c0cf4b1a14f335feb13cdf30820839c

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/suser/mapper/SuserMapper.xml

@@ -31,6 +31,9 @@
        <result column="is_delete" property="isDelete"/>
        <result column="coordinate" property="coordinate"/>
        <result column="addvcd" property="addvcd"/>
        <result column="province" property="province"/>
        <result column="city" property="city"/>
        <result column="district" property="district"/>
    </resultMap>

    <resultMap id="ss" type="org.springblade.jfpt.suser.vo.SuserVOs">
@@ -50,7 +53,8 @@


    <select id="selectSuserPage" resultMap="suserResultMaps">
        select s.id,s.ynumber,ST_ASTEXT(s.coordinate) as coordinate,s.yname,s.phone,s.address,s.type,s.dj,s.information,s.createtime,s.addvcd from sys_suser s left join sys_district d on d.addvcds=s.addvcd  where is_delete=0
        select s.id,s.ynumber,ST_ASTEXT(s.coordinate) as coordinate,s.yname,s.phone,s.address,s.type,s.dj,s.information,s.createtime,s.addvcd,province,city,district
        from sys_suser s left join sys_district d on d.addvcds=s.addvcd  where is_delete=0
        <if test="suser.yname!=null">
            and s.yname like concat(concat('%', #{suser.yname}), '%')
        </if>
@@ -66,6 +70,13 @@
        <if test="suser.dj!=null">
            and s.dj like concat(concat('%', #{suser.dj}), '%')
        </if>
        <if test="suser.province!=null">
            and s.province like concat(concat('%', #{suser.province}), '%')
        </if> <if test="suser.city!=null">
        and s.city like concat(concat('%', #{suser.city}), '%')
    </if> <if test="suser.district!=null">
        and s.district like concat(concat('%', #{suser.district}), '%')
    </if>
        order  by s.createtime
    </select>