Browse Source

待审核列表报错

seyason 6 months ago
parent
commit
5fee752566

+ 8 - 4
fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -1782,10 +1782,14 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 }
             }
             DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd");
-            List<String> dateList = nameList.stream().map(m->(String)m.get("dateStr")).collect(Collectors.toList());
-            //获取最大和最小日期
-            String minDate = dateList.stream().min(Comparator.comparing(String::toString)).get();
-            String maxDate = dateList.stream().max(Comparator.comparing(String::toString)).get();
+            String minDate = null;
+            String maxDate = null;
+            if (nameList.size() > 0) {
+                List<String> dateList = nameList.stream().map(m->(String)m.get("dateStr")).collect(Collectors.toList());
+                //获取最大和最小日期
+                minDate = dateList.stream().min(Comparator.comparing(String::toString)).get();
+                maxDate = dateList.stream().max(Comparator.comparing(String::toString)).get();
+            }
             //设置每人每日考勤打卡时长
             if (timeType.getShowCorpwxCardtime() == 1) {
                 //企业微信的情况