Commit 20a433d7 authored by danfuman's avatar danfuman

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司
parents 75f5d1a2 fe9a7a9b
...@@ -87,7 +87,7 @@ public class CbSummaryProjectImportListener extends AnalysisEventListener<CbSumm ...@@ -87,7 +87,7 @@ public class CbSummaryProjectImportListener extends AnalysisEventListener<CbSumm
//判断上一条数据level是否与当前一致或为上一级 //判断上一条数据level是否与当前一致或为上一级
Optional<CbSummaryProjectImportVo> max = resultList.stream().max(Comparator.comparing(CbSummaryProjectImportVo::getSort)); Optional<CbSummaryProjectImportVo> max = resultList.stream().max(Comparator.comparing(CbSummaryProjectImportVo::getSort));
CbSummaryProjectImportVo preImportVo = null; CbSummaryProjectImportVo preImportVo = null;
if (!max.isPresent()) { if (max.isPresent()) {
preImportVo = max.get(); preImportVo = max.get();
} else { } else {
throw new ServiceException("'序号'列数据错误,无法匹配层级!"); throw new ServiceException("'序号'列数据错误,无法匹配层级!");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment