new nodeInfoList

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringCivilServiceImpl.java

@@ -909,7 +909,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         LambdaQueryWrapper<ZArea> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getAreaId()), ZArea::getId, bo.getAreaId());
         lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), ZArea::getDistrict, bo.getDistrict());
-        Page<ZBuildingBo> page = new Page<>(po.getPageNum(), po.getPageSize());
+//        Page<ZBuildingBo> page = new Page<>(po.getPageNum(), po.getPageSize());
         Page<ZAreaVo> result = zAreaMapper.selectVoPage(po.build(), lqw);
         List<ZAreaVo> IdList = result.getRecords();
         List Id = new ArrayList();

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringPipeJackingServiceImpl.java

@@ -153,10 +153,17 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
                     photoService.insertBatch(list);
                 }
             }
-            if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())) {
-                bo.getzEngineeringNodeBo().setCivliId(add.getId());
-                bo.getzEngineeringNodeBo().setCreateTime(new Date());
-                nodeService.insert(bo.getzEngineeringNodeBo());
+//            if (!ObjectUtils.isEmpty(bo.getzEngineeringNodeBo())) {
+//                bo.getzEngineeringNodeBo().setCivliId(add.getId());
+//                bo.getzEngineeringNodeBo().setCreateTime(new Date());
+//                nodeService.insert(bo.getzEngineeringNodeBo());
+//            }
+            if (bo.getzEngineeringNodeBoList().size() > 0) { // 防止数据库节点表中有type为null的数据
+                for (ZEngineeringNodeBo zEngineeringNodeBo: bo.getzEngineeringNodeBoList()) {
+                    zEngineeringNodeBo.setCivliId(add.getId());
+                    zEngineeringNodeBo.setCreateTime(new Date());
+                    nodeService.insert(zEngineeringNodeBo);
+                }
             }
             return flag;
         }