From 182d489eb0cfb61f89df86b074e5edf544029262 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Sat, 8 May 2021 14:06:16 +0800
Subject: [PATCH] =?UTF-8?q?IndexOutOfBoundsException=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/impl/ScreenUserJoinServiceImpl.java              | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenUserJoinServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenUserJoinServiceImpl.java
index 8b58a474b5..1476600147 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenUserJoinServiceImpl.java
+++ b/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()));