用地报批支持多个节点数据2

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/impl/TdgyImpl.java

@@ -175,19 +175,15 @@ public class TdgyImpl implements TdgyService {
                 String geomDetailsId = geomDetailsMap.get("id");
                 //校验图斑是否与批次报批节点有交集支持多年份多批次的包含（重点）
                 List<Map<String, String>> geomDetailsAndNodeList = nodeLandService.selectGeomIntersectsNode(geomDetailsId);
-                if(CollectionUtils.isNotEmpty(geomDetailsAndNodeList)){
-                    for(Map<String, String> geomDetailsAndNodeMap : geomDetailsAndNodeList){
-                        String nodeId = geomDetailsAndNodeMap.get("node_id");
-                        resultMap.put(nodeId, geomDetailsAndNodeMap.get("id"));
-                    }
+                if(CollectionUtils.isEmpty(geomDetailsAndNodeList)){
+                    throw new ServiceException("当前地块未被包含审核过的批次报批空间数据中，请检查后再上链！");
+                }
+                for(Map<String, String> geomDetailsAndNodeMap : geomDetailsAndNodeList){
+                    String nodeId = geomDetailsAndNodeMap.get("node_id");
+                    resultMap.put(nodeId, geomDetailsAndNodeMap.get("id"));
                 }
             }
-            if(resultMap.isEmpty()){
-                throw new ServiceException("当前地块未被包含审核过的批次报批空间数据中，请检查后再上链！");
-            }
-//            if(resultMap.size()>1){
-//                throw new ServiceException("当前地块未包含多个地块，报批数据不在同一批次！");
-//            }
+
             String tableName ="t_ydbp_data";
             //获取到对应的批次报批节点，插入到流程表中
             Workflow workflow = workflowMapper.selectByProjectTypeAndTableName(Integer.valueOf(ProjectType.BATCH.getCode()), tableName);