From af952e5c54534fc91eb3541edb84393f598041c7 Mon Sep 17 00:00:00 2001 From: hujiaqi Date: Tue, 17 Jan 2017 10:13:46 +0800 Subject: [PATCH] BUG --- .../operate/web/facade/BabyStatisticsManagerFacade.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java index e278f0b..9c94386 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java @@ -229,8 +229,10 @@ public class BabyStatisticsManagerFacade { } if (i1 > i2) { return -1; - } else { + } else if (i1 < i2) { return 1; + } else { + return 0; } } }); @@ -371,8 +373,10 @@ public class BabyStatisticsManagerFacade { } if (i1 > i2) { return 1; - } else { + } else if (i1 < i2) { return -1; + } else { + return 0; } } }); @@ -390,7 +394,7 @@ public class BabyStatisticsManagerFacade { } catch (Exception e) { index++; } - if (babyStatisticsManagerWeekAgeGroupQueryModelList.get(index) == null) { + if (CollectionUtils.isEmpty(babyStatisticsManagerWeekAgeGroupQueryModelList) || babyStatisticsManagerWeekAgeGroupQueryModelList.get(index) == null) { BabyStatisticsManagerWeekAgeGroupQueryModel babyStatisticsManagerWeekAgeGroupQueryModel = new BabyStatisticsManagerWeekAgeGroupQueryModel(); babyStatisticsManagerWeekAgeGroupQueryModel.setCount("0"); babyStatisticsManagerWeekAgeGroupQueryModel.setWeekAge(i.toString()); -- 1.8.3.1