小区信息导入 按需求变更修改【需求：只能导入当前登录人所属组织数据，皮配不上的数据舍弃】

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

@@ -215,7 +215,7 @@ public class NeighborHoodController {
         }
         List<IcNeighborHoodExcel> result =importResult.getList();
 //        log.info(JSON.toJSONString(result));
-        neighborHoodService.importExcel(customerId,result);
+        neighborHoodService.importExcel(customerId,result,tokenDTO.getUserId());
         return new Result();
     }
 

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

@@ -52,5 +52,5 @@ public interface NeighborHoodService{
      */
     void exportNeighborhoodinfo(ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws Exception ;
 
-    void importExcel(String customerId,List<IcNeighborHoodExcel> list);
+    void importExcel(String customerId,List<IcNeighborHoodExcel> list,String staffId);
 }

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

@@ -4,9 +4,11 @@ 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.dto.result.CustomerStaffInfoCacheResult;
 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.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.NeighborhoodConstant;
@@ -238,7 +240,19 @@ public class NeighborHoodServiceImpl implements NeighborHoodService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void importExcel(String customerId,List<IcNeighborHoodExcel> list) {
+    public void importExcel(String customerId,List<IcNeighborHoodExcel> list,String staffId) {
+        //2021.11.9 需求变更 当前工作人员只能导致自己所属组织下数据，网格名对应不上的数据舍弃【注：需求就这样】 sun
+        CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(customerId, staffId);
+        //组织名称不一样的数据舍弃
+        Iterator<IcNeighborHoodExcel> iterator = list.iterator();
+        while (iterator.hasNext()) {
+            IcNeighborHoodExcel obj = iterator.next();
+            if (!obj.getAgencyName().trim().equals(staffInfoCache.getAgencyName())) {
+                iterator.remove();
+            }
+        }
+        //end sun
+
         //导入
         if(CollectionUtils.isEmpty(list)){
             return ;
@@ -274,10 +288,14 @@ public class NeighborHoodServiceImpl implements NeighborHoodService {
             entity.setCustomerId(customerId);
             entity.setNeighborHoodName(icNeighborHoodExcel.getNeighborHoodName());
 
-            entity.setAgencyId(Optional.ofNullable(agencyMap.get(icNeighborHoodExcel.getAgencyName())).map(u->u.getId()).orElse("")); // agencyMap.get(icNeighborHoodExcel.getAgencyName()).getId());
-            entity.setParentAgencyId(Optional.ofNullable(agencyMap.get(icNeighborHoodExcel.getAgencyName())).map(u->u.getPid()).orElse(""));//agencyMap.get(icNeighborHoodExcel.getAgencyName()).getPid()
-            entity.setAgencyPids(Optional.ofNullable(agencyMap.get(icNeighborHoodExcel.getAgencyName())).map(u->u.getPids()).orElse(""));//agencyMap.get(icNeighborHoodExcel.getAgencyName()).getPids()
-            entity.setGridId(Optional.ofNullable(gridMap.get(icNeighborHoodExcel.getGridName())).map(u->u.getId()).orElse(""));//gridMap.get(icNeighborHoodExcel.getGridName()).getId()
+            entity.setAgencyId(Optional.ofNullable(agencyMap.get(icNeighborHoodExcel.getAgencyName().trim())).map(u->u.getId()).orElse("")); // agencyMap.get(icNeighborHoodExcel.getAgencyName()).getId());
+            entity.setParentAgencyId(Optional.ofNullable(agencyMap.get(icNeighborHoodExcel.getAgencyName().trim())).map(u->u.getPid()).orElse(""));//agencyMap.get(icNeighborHoodExcel.getAgencyName()).getPid()
+            entity.setAgencyPids(Optional.ofNullable(agencyMap.get(icNeighborHoodExcel.getAgencyName().trim())).map(u->u.getPids()).orElse(""));//agencyMap.get(icNeighborHoodExcel.getAgencyName()).getPids()
+            entity.setGridId(Optional.ofNullable(gridMap.get(icNeighborHoodExcel.getGridName().trim())).map(u->u.getId()).orElse(""));//gridMap.get(icNeighborHoodExcel.getGridName()).getId()
+            //网格名对应不上的数据舍弃
+            if ("".equals(entity.getGridId())) {
+                continue;
+            }
             entity.setAddress(icNeighborHoodExcel.getAddress());
             entity.setRemark(icNeighborHoodExcel.getRemark());
             neighborHoodEntityList.add(entity);