ソースを参照

修复日报填报检测预估工时是否超支时的代码异常

seyason 1 年間 前
コミット
18269370e5

+ 1 - 1
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportController.java

@@ -1219,7 +1219,7 @@ public class ReportController {
         EstimateTimeSetting estimateTimeSetting = null;
         if(comTimeType.getProjectManDay()==1){
             //剔除其中已通过的日报
-            List<Integer> filledReportIds = reportList.stream().filter(r->r.getId() != -1).map(Report::getId).collect(Collectors.toList());
+            List<Integer> filledReportIds = reportList.stream().filter(r->r.getId() != null).map(Report::getId).collect(Collectors.toList());
             List<Report> targetCheckList = reportList;
             if (filledReportIds.size() > 0) {
                 List<Report> passedReportList = reportMapper.selectList(new QueryWrapper<Report>().select("id").in("id", filledReportIds).eq("state", 1));