Merge remote-tracking branch 'origin/binlog' into binlog

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

 src/main/java/org/springblade/modules/backblast/mapper/BackblastPubRecordMapper.xml

@@ -10,11 +10,12 @@
    <select id="selectBackblastPubRecordPage" resultMap="backblastPubRecordResultMap">
        select
        jbpr.*,
        jg.grid_name,
        br.town_name AS townName,
        br.NAME AS communityName,
        jpag.pcs_name pcsName,
        jda.aoi_name,
        CONCAT( jda.building_name, '-', jda.unit_name, '-', jda.house_name ) houseName,
        CONCAT( IF(jda.building_name,jda.building_name,''), '-', IF(jda.unit_name,jda.unit_name,''), '-', IF(jda.house_name,jda.house_name,'') ) houseName,
        bd.dept_name
        from jczz_backblast_pub_record jbpr
        LEFT JOIN jczz_grid jg on jg.grid_code = jbpr.grid_code and jg.is_deleted = 0
@@ -196,7 +197,7 @@
        br.NAME AS communityName,
        jpag.pcs_name pcsName,
        jda.aoi_name,
        CONCAT( jda.building_name, '-', jda.unit_name, '-', jda.house_name ) houseName,
        CONCAT( IF(jda.building_name,jda.building_name,''), '-', IF(jda.unit_name,jda.unit_name,''), '-', IF(jda.house_name,jda.house_name,'') ) houseName,
        bd.dept_name
        from jczz_backblast_pub_record jbpr
        LEFT JOIN jczz_grid jg on jg.grid_code = jbpr.grid_code and jg.is_deleted = 0