Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

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

@@ -23,6 +23,7 @@ import com.ruoyi.zdsz.service.IZEngineeringReviewService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
 import java.util.*;
@@ -176,11 +177,17 @@ public class ZEngineeringInfrastructureServiceImpl implements IZEngineeringInfra
                     izEngineeringNodeService.insert(zEngineeringNodeBo);
                 }
             }else {
+
                 bo.setId(add.getId());
                 ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
                 zEngineeringNodeBo.setCivliId(add.getId());
+                zEngineeringNodeBo.setType(zEngineeringNodeBo.getType());
                 zEngineeringNodeBo.setCreateTime(add.getCreateTime());
-                izEngineeringNodeService.insert(zEngineeringNodeBo);
+                ZEngineeringNodeBo query = izEngineeringNodeService.query(zEngineeringNodeBo);
+                if (!ObjectUtils.isEmpty(query)) {
+                    zEngineeringNodeBo.setId(query.getId());
+                }
+                izEngineeringNodeService.insert(bo.getzEngineeringNodeBo());
             }
         }
         return flag;
@@ -215,13 +222,6 @@ public class ZEngineeringInfrastructureServiceImpl implements IZEngineeringInfra
         if (flag) {
             ZEngineeringInfrastructureVo vo = baseMapper.selectVoById(update.getId());
 
-//            if (flag) {
-//                ZEngineeringNodeBo zEngineeringNodeBo = bo.getzEngineeringNodeBo();
-//                zEngineeringNodeBo.setCivliId(vo.getId());
-//                zEngineeringNodeBo.setCreateTime(vo.getCreateTime());
-//                izEngineeringNodeService.update(zEngineeringNodeBo);
-//                return flag;
-//            }
 
             List<ZEngineeringNodeBo> nodeBoList = bo.getzEngineeringNodeBoList();
             if(nodeBoList != null && nodeBoList.size() != 0){
@@ -231,8 +231,6 @@ public class ZEngineeringInfrastructureServiceImpl implements IZEngineeringInfra
                     zEngineeringNodeBo.setCreateTime(vo.getCreateTime());
                     if(zEngineeringNodeBo.getId() != null){
                         izEngineeringNodeService.update(zEngineeringNodeBo);
-                    }else {
-                        izEngineeringNodeService.insert(zEngineeringNodeBo);
                     }
                 }
             }else {
@@ -242,8 +240,6 @@ public class ZEngineeringInfrastructureServiceImpl implements IZEngineeringInfra
                 zEngineeringNodeBo.setCreateTime(vo.getCreateTime());
                 if(zEngineeringNodeBo.getId() != null){
                     izEngineeringNodeService.update(zEngineeringNodeBo);
-                }else {
-                    izEngineeringNodeService.insert(zEngineeringNodeBo);
                 }
             }
         }