Merge branch 'V2.0.3' of http://103.249.252.28:90/lcy/education

29bf5c11 · 李博今 · 78e69e5f · e8182065 · 29bf5c11
Commit 29bf5c11 authored Jun 06, 2018 by 李博今
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

BSlScheduleServiceImpl.java ...ness/bslschedule/service/impl/BSlScheduleServiceImpl.java +3 -1

No files found.
--- a/src/main/java/org/rcisoft/business/bslschedule/service/impl/BSlScheduleServiceImpl.java
+++ b/src/main/java/org/rcisoft/business/bslschedule/service/impl/BSlScheduleServiceImpl.java
@@ -308,7 +308,9 @@ public class BSlScheduleServiceImpl implements BSlScheduleService {
            }
        }
        //会多出一行，移除
-        resultList.remove(resultList.size() - 1);
+        if(resultList.size()>0){
+            resultList.remove(resultList.size() - 1);
+        }
        List<BSlSchedule> list = bSlScheduleRepository.queryMoreBSlSchedules(
                format0.format(minCal.getTime()),
                format0.format(maxCal.getTime()),