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

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/CpcIndexCalculateServiceImpl.java

@@ -132,7 +132,7 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
                 });
             }
             insertCpcScoreBatch(formDTO, result, IndexCodeEnum.DANG_YUAN_XIANG_GUAN.getCode());
-        } while (!CollectionUtils.isEmpty(list));
+        } while (!CollectionUtils.isEmpty(list) && list.size() == pageSize);
 
     }