Merge remote-tracking branch 'origin/master'

linwei

2024-01-08 ea3c7c83c3d8338894d1a7e266784778dcdca7b5

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

@@ -168,6 +168,7 @@
        jda.nei_name AS neiName,
        jg.grid_name,
        jhs.building,
        jhs.district_code aoiCode,
        jhs.unit
        FROM
        jczz_household jh
@@ -355,7 +356,7 @@
        left join jczz_user_house_label jhl on jh.id = jhl.household_id
        where 1=1 and jh.is_deleted = 0
        and jh.house_code = #{code}
        order by jh.relationship asc,jh.id desc
        order by -jh.relationship desc,jh.id desc
    </select>

    <!--查询房屋集合信息-按id-->
@@ -698,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">
@@ -708,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>