Merge remote-tracking branch 'origin/master'

linwei

2024-01-08 ea3c7c83c3d8338894d1a7e266784778dcdca7b5

Merge remote-tracking branch 'origin/master'

 src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml

@@ -431,6 +431,7 @@
        from jczz_place_rel jpl
        join jczz_place jp on jpl.place_id = jp.id and jp.is_deleted = 0
        where jpl.is_deleted = 0
        and doorplate_num!=''
        <if test="houseParam.communityName!=null and houseParam.communityName!=''">
            and community_name like concat('%',#{houseParam.communityName},'%')
        </if>

 src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml

@@ -699,7 +699,7 @@
            <if test="household.regionCode!=null and household.regionCode!=''">
                and jg.community_code like concat('%',#{household.regionCode},'%')
            </if>
            <if test="household.id!=null and household.id!=''">
            <if test="household.id!=null">
                and jh.id = #{household.id}
            </if>
            <if test="household.labelId!=null">
@@ -709,7 +709,10 @@
                and CONCAT(jh.name,jh.phone_number) like CONCAT ('%', #{household.searchKey},'%')
            </if>
            and jh.is_deleted = 0
            order by jh.create_time desc
            order by jh.create_time desc,jh.id desc
            <if test="household.limit!=null">
                limit #{household.limit}
            </if>
        </where>
    </select>


 src/main/java/org/springblade/modules/house/vo/HouseholdVO.java

@@ -158,4 +158,9 @@
     */
    private String searchKey;

    /**
     * 取值数
     */
    private Integer limit;

}

 src/main/java/org/springblade/modules/task/mapper/EcCallEventMapper.xml

@@ -48,6 +48,7 @@
        <if test="eCallEvent.communityName!=null and eCallEvent.communityName!=''">
            and br.name like concat('%',#{eCallEvent.communityName},'%')
        </if>
        order by jece.create_time desc,jece.id desc
    </select>