From 21ccdc14bc3708deb59ef7c37f3e074bfb6d5ada Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Wed, 10 Aug 2022 10:05:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E4=B8=80=E6=88=BF=E9=97=B4=E5=8F=B7?=
 =?UTF-8?q?=E4=B8=A4=E6=AC=A1=E6=8F=90=E4=BA=A4=E8=B0=83=E6=95=B4=E4=B8=BA?=
 =?UTF-8?q?=E4=B8=A4=E6=9D=A1=E7=94=B3=E8=AF=B7=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/form/SaveCollectFormDTO.java | 5 +++++
 .../com/epmet/service/impl/IcResiCollectServiceImpl.java     | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SaveCollectFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SaveCollectFormDTO.java
index 81f370d3c6..7c3dd2983d 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SaveCollectFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/SaveCollectFormDTO.java
@@ -14,6 +14,11 @@ import java.util.List;
 @Data
 public class SaveCollectFormDTO implements Serializable {
 
+    /**
+     * id
+     */
+    private String id;
+
     /**
      * 客户Id customer.id
      */
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 d130fee916..bbdd720298 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
@@ -153,8 +153,7 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result saveCollectInfo(SaveCollectFormDTO formDTO) {
-        IcResiCollectEntity collectInfo = baseDao.selectByAddress(formDTO.getAddress());
-        if (null == collectInfo) {
+        if (StringUtils.isBlank(formDTO.getId())) {
             //插入主表
             IcResiCollectEntity entity = ConvertUtils.sourceToTarget(formDTO, IcResiCollectEntity.class);
             //根据小区id查询网格相关信息
@@ -176,6 +175,7 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
                 }
             });
         } else {
+            IcResiCollectEntity collectInfo = baseDao.selectByAddress(formDTO.getAddress());
             //更新主表
             baseDao.updateRec(collectInfo.getId(), formDTO.getHouseType(), formDTO.getHouseHolderName(), formDTO.getTotalResi(),null);
             List<IcResiMemberEntity> newMemberList = ConvertUtils.sourceToTarget(formDTO.getMemberList(), IcResiMemberEntity.class);