Merge remote-tracking branch 'origin/master'

linwe

2023-11-25 8400a67289b214b83a20484410fff96d236c6d49

 src/main/java/org/springblade/modules/property/mapper/PropertyCapitalApplyMapper.xml

@@ -27,9 +27,18 @@
        <result column="is_deleted" property="isDeleted"/>
    </resultMap>


    <!--自定义分页查询-->
    <select id="selectPropertyCapitalApplyPage" resultMap="propertyCapitalApplyResultMap">
        select * from jczz_property_capital_apply where is_deleted = 0
        <if test="propertyCapitalApply.districtId!=null">
            and district_id = #{propertyCapitalApply.districtId}
        </if>
        <if test="propertyCapitalApply.name!=null and propertyCapitalApply.name!=''">
            and name like concat('%',#{propertyCapitalApply.name},'%')
        </if>
        <if test="propertyCapitalApply.linkman!=null and propertyCapitalApply.linkman!=''">
            and linkman like concat('%',#{propertyCapitalApply.linkman},'%')
        </if>
    </select>