From ab53164d32e88c168cb3c90506a94d0cf0c051ce Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 08 Aug 2024 09:58:33 +0800
Subject: [PATCH] 反诈导出 bug 修复
---
src/main/java/org/springblade/modules/house/vo/UserHouseLabelVO.java | 3 +++
src/main/java/org/springblade/modules/backblast/mapper/BackblastPubRecordMapper.xml | 4 ++--
src/main/java/org/springblade/modules/house/entity/UserHouseLabelEntity.java | 2 --
3 files changed, 5 insertions(+), 4 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 8fc65cb..1973969 100644
--- a/src/main/java/org/springblade/modules/backblast/mapper/BackblastPubRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/backblast/mapper/BackblastPubRecordMapper.xml
@@ -14,7 +14,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
@@ -196,7 +196,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
diff --git a/src/main/java/org/springblade/modules/house/entity/UserHouseLabelEntity.java b/src/main/java/org/springblade/modules/house/entity/UserHouseLabelEntity.java
index 06c8c0f..d659d22 100644
--- a/src/main/java/org/springblade/modules/house/entity/UserHouseLabelEntity.java
+++ b/src/main/java/org/springblade/modules/house/entity/UserHouseLabelEntity.java
@@ -87,6 +87,4 @@
@TableField(value = "create_time",fill = FieldFill.INSERT)
private Date createTime;
- private String taskRange;
-
}
diff --git a/src/main/java/org/springblade/modules/house/vo/UserHouseLabelVO.java b/src/main/java/org/springblade/modules/house/vo/UserHouseLabelVO.java
index 869a0f8..1253cfe 100644
--- a/src/main/java/org/springblade/modules/house/vo/UserHouseLabelVO.java
+++ b/src/main/java/org/springblade/modules/house/vo/UserHouseLabelVO.java
@@ -31,4 +31,7 @@
public class UserHouseLabelVO extends UserHouseLabelEntity {
private static final long serialVersionUID = 1L;
+ private String taskRange;
+
+
}
--
Gitblit v1.9.3