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

# Conflicts:
#	epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java

@@ -19,6 +19,7 @@ package com.epmet.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.enums.EnvEnum;
@@ -42,6 +43,7 @@ import com.epmet.dto.result.ImportTaskCommonResultDTO;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.service.IcNeighborHoodService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
@@ -53,6 +55,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.awt.image.BufferedImage;
 import java.io.*;
 import java.net.URLEncoder;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -79,8 +82,17 @@ public class IcNeighborHoodController {
         return new Result<PageData<IcNeighborHoodDTO>>().ok(page);
     }
 
+    /**
+     * 可根据agencyId或者gridId查询
+     * @param params
+     * @return
+     */
     @PostMapping("open/list")
     public Result<PageData<IcNeighborHoodDTO>> openList(@RequestBody IcNeighborHoodAddFormDTO params){
+        if (StringUtils.isBlank(params.getAgencyId()) && StringUtils.isBlank(params.getGridId())) {
+            PageData<IcNeighborHoodDTO> result = new PageData<>(new ArrayList<>(), NumConstant.ZERO);
+            return new Result<PageData<IcNeighborHoodDTO>>().ok(result);
+        }
         PageData<IcNeighborHoodDTO> page = icNeighborHoodService.openPage(params);
         return new Result<PageData<IcNeighborHoodDTO>>().ok(page);
     }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java

@@ -693,7 +693,8 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
     @Override
     public PageData<IcNeighborHoodDTO> openPage(IcNeighborHoodAddFormDTO params) {
         LambdaQueryWrapper<IcNeighborHoodEntity> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(IcNeighborHoodEntity::getAgencyId,params.getAgencyId());
+        wrapper.eq(StringUtils.isNotBlank(params.getAgencyId()), IcNeighborHoodEntity::getAgencyId, params.getAgencyId())
+                .eq(StringUtils.isNotBlank(params.getGridId()), IcNeighborHoodEntity::getGridId, params.getGridId());
         PageData<IcNeighborHoodDTO> result = null;
         List<IcNeighborHoodDTO> list = null;
         if (params.getIsPage()){