wangxuan 4 місяців тому
батько
коміт
58f480c1b8

+ 6 - 6
business-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ZhcxCommissionCheckServiceImpl.java

@@ -1795,20 +1795,20 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
         Map<String, ZhcxProjectDeviceNumberDo> deviceMap = new HashMap<>(deviceNumberList.size());
         deviceNumberList.stream().forEach(item -> deviceMap.put(item.getId(), item));
 
-        //删除树
-        zhcxCommissionCheckDetailTreeService.delByPrjId(commissionCheckDo.getProjectid());
-
-        //删除明细
-        zhcxCommissionCheckDetailService.delByPrjId(commissionCheckDo.getProjectid());
-
         //导出明细
         final ImportProjectCheckBO importCheckDetail = importCheckDetail(importDto, file);
 
         if (ObjectUtil.isNotEmpty(importCheckDetail.getTreeList())) {
+            //删除树
+            zhcxCommissionCheckDetailTreeService.delByPrjId(commissionCheckDo.getProjectid());
+            // 在去新增
             zhcxCommissionCheckDetailTreeService.saveBatch(importCheckDetail.getTreeList());
         }
 
         if (ObjectUtil.isNotEmpty(importCheckDetail.getDetailList())) {
+            //删除明细
+            zhcxCommissionCheckDetailService.delByPrjId(commissionCheckDo.getProjectid());
+            // 新增子表
             zhcxCommissionCheckDetailService.saveBatch(importCheckDetail.getDetailList());
         }