Merge remote-tracking branch 'origin/dev_pingyin_7_22' into dev_pingyin_7_22

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java

@@ -215,7 +215,7 @@ public class DataReportingServiceImpl implements DataReportingService {
 		List<EventInfoResultDTO> list;
 		//根据入参，获取项目
 		long start = System.currentTimeMillis();
-		List<ScreenProjectDataDTO> projectList = screenProjectDataService.getProjectList(formDTO.getCustomerId(), formDTO.getProjectId(), formDTO.getPageNo(), formDTO.getPageSize());
+		List<ScreenProjectDataDTO> projectList = screenProjectDataService.getProjectListV2(formDTO.getCustomerId(), formDTO.getProjectId(), formDTO.getPageNo(), formDTO.getPageSize());
 		log.info("事件上报-查询项目列表耗时:{}ms",System.currentTimeMillis()-start);
 		//项目列表为空，返回空数组
 		if(CollectionUtils.isEmpty(projectList)) {