From bec8cb2afe4ada2ab2101baae8833cc637a5043e Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 21 Mar 2022 10:01:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E9=9B=86=E5=88=97=E8=A1=A8=E5=BE=AE?=
 =?UTF-8?q?=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/form/CollectListFormDTO.java | 4 +---
 .../com/epmet/service/impl/IcResiCollectServiceImpl.java | 3 ---
 .../src/main/resources/mapper/IcResiCollectDao.xml       | 9 ---------
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java
index ae5ec4bacb..8c089ae331 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java
@@ -24,9 +24,7 @@ public class CollectListFormDTO implements Serializable {
     private Integer pageSize;
 
     private String orgId;
-    private String neighborHoodId;
-    private String buildingId;
-    private String houseId;
+
     private String address;
 
     /**
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 4037180bf0..fc714f2912 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
@@ -86,9 +86,6 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
     public PageData<CollectListResultDTO> getCollectList(CollectListFormDTO formDTO) {
         PageData<CollectListResultDTO> result = new PageData<>(new ArrayList<>(), 0);
         if (StringUtils.isBlank(formDTO.getOrgId()) &&
-                StringUtils.isBlank(formDTO.getNeighborHoodId()) &&
-                StringUtils.isBlank(formDTO.getBuildingId()) &&
-                StringUtils.isBlank(formDTO.getHouseId()) &&
                 StringUtils.isBlank(formDTO.getAddress()) &&
                 StringUtils.isBlank(formDTO.getStartDate()) &&
                 StringUtils.isBlank(formDTO.getEndDate()) ){
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml
index 7f2c5a9a4d..0be0e43c13 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml
@@ -30,15 +30,6 @@
         <if test='orgId != null and orgId != "" '>
             AND CONCAT(c.PIDS,':',c.AGENCY_ID) LIKE CONCAT('%',#{orgId},'%')
         </if>
-        <if test='neighborHoodId != null and neighborHoodId != "" '>
-            AND c.VILLAGE_ID = #{neighborHoodId}
-        </if>
-        <if test='buildingId != null and buildingId != "" '>
-            AND c.BUILD_ID = #{buildingId}
-        </if>
-        <if test='houseId != null and houseId != "" '>
-            AND c.HOME_ID = #{houseId}
-        </if>
         <if test='address != null and address != "" '>
             AND c.ADDRESS LIKE CONCAT('%',#{address},'%')
         </if>