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

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

@@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.epmet.commons.tools.enums.OrgTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -307,6 +308,11 @@ public class NeighborHoodServiceImpl implements NeighborHoodService {
 //        neighborHoodEntityQueryWrapper.eq("a.DEL_FLAG","0");
         IcNeighborHoodEntity neighbor = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodEntity.class);
         neighbor.setDelFlag("0");
+        if(OrgTypeEnum.GRID.getCode().equals(formDTO.getLevel())){
+            neighbor.setGridId(formDTO.getId());
+        }else{
+            neighbor.setAgencyId(formDTO.getId());
+        }
         IcHouseEntity house = ConvertUtils.sourceToTarget(formDTO, IcHouseEntity.class);
         return  icNeighborHoodDao.searchAllNeighborhood(neighbor,house);
     }