试车world导出调整5

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

@@ -1861,8 +1861,8 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
             return;
         }
 
-        zhcxCommissionCheckDetailTreeService.delByPrjId(importDto.getProjectId());//删除树
-        zhcxCommissionCheckDetailService.delByPrjId(importDto.getProjectId());//删除明细
+        //zhcxCommissionCheckDetailTreeService.delByPrjId(importDto.getProjectId());//删除树
+        //zhcxCommissionCheckDetailService.delByPrjId(importDto.getProjectId());//删除明细
 
         for (int m = 0, n = commissionCheckDos.size(); m < n; m++) {
             ZhcxCommissionCheckDo check = commissionCheckDos.get(m);
@@ -1871,9 +1871,11 @@ public class ZhcxCommissionCheckServiceImpl extends ServiceImpl<ZhcxCommissionCh
                 importDto.setId(check.getId());
                 final ImportProjectCheckBO importCheckDetail = importCheckDetail(importDto, file);
                 if (ObjectUtil.isNotEmpty(importCheckDetail.getTreeList())) {
+                    zhcxCommissionCheckDetailTreeService.delByPrjId(importDto.getProjectId());//删除树
                     zhcxCommissionCheckDetailTreeService.saveBatch(importCheckDetail.getTreeList());
                 }
                 if (ObjectUtil.isNotEmpty(importCheckDetail.getDetailList())) {
+                    zhcxCommissionCheckDetailService.delByPrjId(importDto.getProjectId());//删除明细
                     zhcxCommissionCheckDetailService.saveBatch(importCheckDetail.getDetailList());
                 }
             } else {