From fe93517ca376681c71c5471df8d31956a774fac7 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 1 Apr 2022 10:16:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=A4=8Did?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IcResiCollectServiceImpl.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
index 5fb9b80a4b..8f348ab680 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
@@ -170,6 +170,7 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
                     mem.setCustomerId(formDTO.getCustomerId());
                     //姓名或份身份证号不为空时插入
                     mem.setIcResiCollectId(insert.getId());
+                    mem.setId(null);
                     icResiMemberDao.insert(mem);
                 }
             });
@@ -230,9 +231,9 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
         resDTO.setHouseType(entity.getHouseType());
         resDTO.setHouseHolderName(entity.getHouseHolderName());
         resDTO.setTotalResi(entity.getTotalResi());
-        resDTO.setVillageName(entity.getVillageName());
-        resDTO.setBuildName(entity.getBuildName());
-        resDTO.setUnitName(entity.getUnitName());
-        resDTO.setHomeName(entity.getHomeName());
+        resDTO.setVillageName(StringUtils.isBlank(entity.getVillageName()) ? StrConstant.EPMETY_STR : entity.getVillageName());
+        resDTO.setBuildName(StringUtils.isBlank(entity.getBuildName()) ? StrConstant.EPMETY_STR : entity.getBuildName());
+        resDTO.setUnitName(StringUtils.isBlank(entity.getUnitName()) ? StrConstant.EPMETY_STR : entity.getUnitName());
+        resDTO.setHomeName(StringUtils.isBlank(entity.getHomeName()) ? StrConstant.EPMETY_STR : entity.getHomeName());
     }
 }