Merge remote-tracking branch 'origin/master'

linwe

2023-11-23 d0e27ecff97fff5fabed2696c9813c8e17ac6322

 src/main/java/org/springblade/modules/district/mapper/DistrictMapper.xml

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


    <select id="selectDistrictPage" resultMap="districtResultMap">
        select * from jczz_district where is_deleted = 0
    <!--自定义分页-->
    <select id="selectDistrictPage" resultType="org.springblade.modules.district.vo.DistrictVO">
        select * from jczz_district
        where is_deleted = 0
        <if test="district.name !=null and district.name !=''">
            and name like concat('%',#{district.name},'%')
        </if>
        <if test="district.communityCode !=null and district.communityCode !=''">
            and community_code = #{district.communityCode}
        </if>
    </select>