Merge remote-tracking branch 'origin/develop' into release_temp

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;
 
     /**

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()) ){

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>