Merge remote-tracking branch 'origin/master'

linwe

2023-12-19 7b6ad0f09bfc5cd45a1aacfdfe55e69a02b9ff26

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

@@ -170,6 +170,9 @@
            and house_name != ''
            and doorplate_type = '户室牌'
            and building_code = #{houseParam.code}
            <if test="houseParam.searchKey!=null and houseParam.searchKey!=''">
                and jh.name like concat('%',#{houseParam.searchKey},'%')
            </if>
            <include refid="filterHouseGrid"/>
        )
        union all
@@ -451,4 +454,9 @@
            )
        ) a on jda.id = a.id
    </select>

    <!--查询所有的地址表和场所表差集集合(小区和非小区的)-->
    <select id="getDoorplateAddressVODetail" resultType="org.springblade.modules.doorplateAddress.vo.DoorplateAddressVO">
        select jda.* from jczz_doorplate_address jda where address_code = #{doorplateAddress.addressCode}
    </select>
</mapper>