From 2f6b6aaaccd982d1b9b0ab269433c8e91d484b30 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 4 Aug 2022 13:56:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=87=E9=9B=86=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/form/IcResiCollectCheckFormDTO.java  | 6 ------
 .../com/epmet/service/impl/IcResiCollectServiceImpl.java    | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectCheckFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectCheckFormDTO.java
index bbf0d029be..ad0ac9f106 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectCheckFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectCheckFormDTO.java
@@ -18,12 +18,6 @@ public class IcResiCollectCheckFormDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 新增标识(1:新增；2：修改)
-     */
-    @NotBlank(message = "新增标识不能为空")
-    private String addFlag;
-
     /**
      * 主键
      */
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 d0ff7f8641..c9074ace6b 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
@@ -354,10 +354,10 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
         icResiCollectEntity.setCheckReason(formDTO.getCheckReason());
         baseDao.updateById(icResiCollectEntity);
 
-        // 审核通过
+        // 审核状态：0待审核 1未通过 2已通过
         if("2".equals(formDTO.getCheckState())){
 
-            if("1".equals(formDTO.getAddFlag())){
+            if("other".equals(icResiCollectEntity.getHomeId())){
                 // 新增房屋（新增房屋操作已在审核接口之前，前端调用新增接口实现）
                 // 更新登记表房屋ID
                 icResiCollectEntity = updateHomeId(icResiCollectEntity,formDTO);