Merge remote-tracking branch 'origin/master'

linwe

2023-11-24 8a28bb397d5743edf1da5930db0d6d0fdd86b35e

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

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


    <!--自定义分页查询-->
    <select id="selectPropertyCompanyPage" resultMap="propertyCompanyResultMap">
        select * from jczz_property_company where is_deleted = 0
        <if test="propertyCompany.name!=null and propertyCompany.name!=''">
            and name like concat('%',#{propertyCompany.name},'%')
        </if>
    </select>

    <!--物业公司列表查询（不分页）-->
    <select id="getPropertyCompanyList" resultMap="propertyCompanyResultMap">
        select * from jczz_property_company where is_deleted = 0
        <if test="propertyCompany.name!=null and propertyCompany.name!=''">
            and name like concat('%',#{propertyCompany.name},'%')
        </if>
    </select>