Merge remote-tracking branch 'remotes/origin/dev'

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenUserJoinServiceImpl.java

@@ -85,12 +85,14 @@ public class ScreenUserJoinServiceImpl extends BaseServiceImpl<ScreenUserJoinDao
                 for (int j = NumConstant.ZERO; j < lastMonthJoinList.size(); j++) {
                     if (list.get(i).getOrgId().equals(lastMonthJoinList.get(j).getOrgId())) {
                         ScreenUserJoinEntity entity = ConvertUtils.sourceToTarget(list.get(i), ScreenUserJoinEntity.class);
-                        ScreenUserJoinEntity lastJoinEntity = lastMonthJoinList.get(i);
-                        if (lastJoinEntity == null){
+                        ScreenUserJoinEntity lastJoinEntity = null;
+                        if (i > lastMonthJoinList.size()){
                             lastJoinEntity = new ScreenUserJoinEntity();
                             lastJoinEntity.setJoinTotal(NumConstant.ZERO);
                             lastJoinEntity.setAvgIssue(NumConstant.ZERO_DECIMAL);
                             lastJoinEntity.setAvgJoin(NumConstant.ZERO_DECIMAL);
+                        }else{
+                            lastJoinEntity = lastMonthJoinList.get(i);
                         }
                         entity.setJoinTotalUpRate(this.calculateGrowthRateNumber(lastJoinEntity.getJoinTotal(), list.get(j).getJoinTotal()));
                         entity.setJoinTotalUpFlag(this.calculateGrowthRateFlag(lastJoinEntity.getJoinTotal(), list.get(j).getJoinTotal()));