From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog
---
src/main/java/org/springblade/modules/backblast/mapper/BackblastPubRecordMapper.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/backblast/mapper/BackblastPubRecordMapper.xml b/src/main/java/org/springblade/modules/backblast/mapper/BackblastPubRecordMapper.xml
index 87d7359..00925ba 100644
--- a/src/main/java/org/springblade/modules/backblast/mapper/BackblastPubRecordMapper.xml
+++ b/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
@@ -28,7 +29,7 @@
and br.town_name like concat('%',#{backblastPubRecord.townName},'%')
</if>
<if test="backblastPubRecord.communityName != null and backblastPubRecord.communityName != ''">
- and jbr.name like concat('%',#{backblastPubRecord.communityName},'%')
+ and br.name like concat('%',#{backblastPubRecord.communityName},'%')
</if>
<if test="backblastPubRecord.pcsName != null and backblastPubRecord.pcsName != ''">
and jpag.pcs_name like concat('%',#{backblastPubRecord.pcsName},'%')
@@ -164,7 +165,7 @@
and br.town_name like concat('%',#{backblastPubRecord.townName},'%')
</if>
<if test="backblastPubRecord.communityName != null and backblastPubRecord.communityName != ''">
- and jbr.name like concat('%',#{backblastPubRecord.communityName},'%')
+ and br.name like concat('%',#{backblastPubRecord.communityName},'%')
</if>
<if test="backblastPubRecord.pcsName != null and backblastPubRecord.pcsName != ''">
and jpag.pcs_name like concat('%',#{backblastPubRecord.pcsName},'%')
@@ -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
@@ -210,7 +211,7 @@
and br.town_name like concat('%',#{backblastPubRecord.townName},'%')
</if>
<if test="backblastPubRecord.communityName != null and backblastPubRecord.communityName != ''">
- and jbr.name like concat('%',#{backblastPubRecord.communityName},'%')
+ and br.name like concat('%',#{backblastPubRecord.communityName},'%')
</if>
<if test="backblastPubRecord.pcsName != null and backblastPubRecord.pcsName != ''">
and jpag.pcs_name like concat('%',#{backblastPubRecord.pcsName},'%')
--
Gitblit v1.9.3