From 4f9a0ac1230b37fab4f900058563ef1995a1bd42 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 10 May 2022 15:43:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=B0=B1=E6=98=AF=E6=97=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/HouseServiceImpl.java  | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
index 9b7ff4c489..9949a8753c 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
@@ -202,30 +202,30 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
             entityList.add(e);
         }
         if (!houseDTO.getOwnerName().equals(entity.getOwnerName())){
-            sbAfter.append(HouseChangeEnums.OWNER_NAME.getColumnName()).append(":").append(houseDTO.getOwnerName()).append("；");
-            sbBefore.append(HouseChangeEnums.OWNER_NAME.getColumnName()).append(":").append(entity.getOwnerName()).append("；");
+            sbAfter.append(HouseChangeEnums.OWNER_NAME.getColumnName()).append(":").append(StringUtils.isNotBlank(houseDTO.getOwnerName()) ? houseDTO.getOwnerName() : "无").append("；");
+            sbBefore.append(HouseChangeEnums.OWNER_NAME.getColumnName()).append(":").append(StringUtils.isNotBlank(entity.getOwnerName()) ? entity.getOwnerName() : "无").append("；");
             IcHouseChangeDetailEntity e = new IcHouseChangeDetailEntity();
             e.setChangeCol(HouseChangeEnums.OWNER_NAME.getColumn());
-            e.setChangeAfter(houseDTO.getOwnerName());
-            e.setChangeBefore(entity.getOwnerName());
+            e.setChangeAfter(StringUtils.isNotBlank(houseDTO.getOwnerName()) ? houseDTO.getOwnerName() : "无");
+            e.setChangeBefore(StringUtils.isNotBlank(entity.getOwnerName()) ? entity.getOwnerName() : "无");
             entityList.add(e);
         }
         if (!houseDTO.getOwnerPhone().equals(entity.getOwnerPhone())){
-            sbAfter.append(HouseChangeEnums.OWNER_PHONE.getColumnName()).append(":").append(houseDTO.getOwnerPhone()).append("；");
-            sbBefore.append(HouseChangeEnums.OWNER_PHONE.getColumnName()).append(":").append(entity.getOwnerPhone()).append("；");
+            sbAfter.append(HouseChangeEnums.OWNER_PHONE.getColumnName()).append(":").append(StringUtils.isNotBlank(houseDTO.getOwnerPhone()) ? houseDTO.getOwnerPhone() : "无").append("；");
+            sbBefore.append(HouseChangeEnums.OWNER_PHONE.getColumnName()).append(":").append(StringUtils.isNotBlank(entity.getOwnerPhone()) ? entity.getOwnerPhone() : "无").append("；");
             IcHouseChangeDetailEntity e = new IcHouseChangeDetailEntity();
             e.setChangeCol(HouseChangeEnums.OWNER_PHONE.getColumn());
-            e.setChangeAfter(houseDTO.getOwnerPhone());
-            e.setChangeBefore(entity.getOwnerPhone());
+            e.setChangeAfter(StringUtils.isNotBlank(houseDTO.getOwnerPhone()) ? houseDTO.getOwnerPhone() : "无");
+            e.setChangeBefore(StringUtils.isNotBlank(entity.getOwnerPhone()) ? entity.getOwnerPhone() : "无");
             entityList.add(e);
         }
         if (!houseDTO.getOwnerIdCard().equals(entity.getOwnerIdCard())){
-            sbAfter.append(HouseChangeEnums.OWNER_ID_CARD.getColumnName()).append(":").append(houseDTO.getOwnerIdCard()).append("；");
-            sbBefore.append(HouseChangeEnums.OWNER_ID_CARD.getColumnName()).append(":").append(entity.getOwnerIdCard()).append("；");
+            sbAfter.append(HouseChangeEnums.OWNER_ID_CARD.getColumnName()).append(":").append(StringUtils.isNotBlank(houseDTO.getOwnerIdCard()) ? houseDTO.getOwnerIdCard() : "无").append("；");
+            sbBefore.append(HouseChangeEnums.OWNER_ID_CARD.getColumnName()).append(":").append(StringUtils.isNotBlank(entity.getOwnerIdCard()) ? entity.getOwnerIdCard() : "无").append("；");
             IcHouseChangeDetailEntity e = new IcHouseChangeDetailEntity();
             e.setChangeCol(HouseChangeEnums.OWNER_ID_CARD.getColumn());
-            e.setChangeAfter(houseDTO.getOwnerIdCard());
-            e.setChangeBefore(entity.getOwnerIdCard());
+            e.setChangeAfter(StringUtils.isNotBlank(houseDTO.getOwnerIdCard()) ? houseDTO.getOwnerIdCard() : "无");
+            e.setChangeBefore(StringUtils.isNotBlank(entity.getOwnerIdCard()) ? entity.getOwnerIdCard() : "无");
             entityList.add(e);
         }
         if (StringUtils.isNotBlank(sbAfter)){