-

Signed-off-by: Administrator <admin@example.com>

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/listener/CbProjectOtherImportListener.java

@@ -70,8 +70,8 @@ public class CbProjectOtherImportListener extends AnalysisEventListener<CbProjec
             }else{
                 importVo.setDealWithNumber(importVo.getNumber());
             }
-            dataList.add(importVo);
         }
+        dataList.add(importVo);
     }
 
     @Override

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbProjectOtherServiceImpl.java

@@ -226,19 +226,19 @@ public class CbProjectOtherServiceImpl extends ServiceImpl<CbProjectOtherMapper,
                         String number = importVo.getNumber();
 
                         CbProjectOther cbProjectOther = new CbProjectOther();
+                        BeanUtil.copyProperties(importVo, cbProjectOther);
                         //保存一级节点
                         if (ReUtil.isMatch(firstPattern, number) || ReUtil.isMatch(pattern3, number)) {
-                            BeanUtil.copyProperties(importVo, cbProjectOther);
                             cbProjectOther.setParentId(rootMeasuresId);
                         } else if (ReUtil.isMatch(secondPattern, number)) {
-                            BeanUtil.copyProperties(importVo, cbProjectOther);
                             // 根据no查询父级节点
                             CbProjectOther parentCbCostMeasure = getCbProjectOther(rootMeasuresId, number, projectId, cbStage);
-                            String[] split = number.split("\\.");
                             cbProjectOther.setParentId(parentCbCostMeasure.getId());
                         }
-                        String newNo = String.valueOf(rootMeasuresId).concat(".").concat(cbProjectOther.getDealWithNumber());
-                        cbProjectOther.setDealWithNumber(newNo);
+                        if (ObjectUtil.isNotEmpty(cbProjectOther.getDealWithNumber())) {
+                            String newNo = String.valueOf(rootMeasuresId).concat(".").concat(cbProjectOther.getDealWithNumber());
+                            cbProjectOther.setDealWithNumber(newNo);
+                        }
                         cbProjectOther.setProjectId(projectId);
                         cbProjectOther.setCbStage(cbStage);
                         this.save(cbProjectOther);