diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java index 33fd65dd1b..070fcca43a 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/project/impl/ProjectServiceImpl.java @@ -530,11 +530,11 @@ public class ProjectServiceImpl implements ProjectService { @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true) @Override public List queryMassesDiscontentMultic(MassesDiscontentFormV2DTO formDTO) { - PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); formDTO.setEndDate(getDateId(ProjectConstant.YESTERDAY)); formDTO.setStartDate(getDateId(formDTO.getTimeSection())); log.info(JSON.toJSONString(formDTO,true)); //已结案、并且来源于议题、在当前时间范围内的、 + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); List list = projectDao.selectMassesDiscontentMultic(formDTO.getAgencyId(), formDTO.getAreaCode(), formDTO.getStartDate(), diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java index 89e72048cf..c5845d11c8 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java @@ -563,10 +563,10 @@ public class CodeServiceImpl implements CodeService { @Override public PageData history(CodeCommonFormDTO formDTO) { - PageHelper.startPage(formDTO.getPage(), formDTO.getLimit()); //获取上传代码信息 // CodeCustomerDTO code = codeCustomerService.get(formDTO.getCodeId()); //获取上传代码信息 + PageHelper.startPage(formDTO.getPage(), formDTO.getLimit()); List list = codeOperationHistoryService.getHistoryList(formDTO.getCustomerId(), formDTO.getClientType()); PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java index f45707ee7b..62274c346b 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java @@ -588,7 +588,6 @@ public class ArticleServiceImpl extends BaseServiceImpl resultList; List roles = epmetUserOpenFeignClient.getStaffRoles(tokenDto.getUserId()).getData(); LoginUserDetailsFormDTO loginUserDetailsFormDTO = new LoginUserDetailsFormDTO(); @@ -612,12 +611,14 @@ public class ArticleServiceImpl extends BaseServiceImpl gridList = new HashSet<>(); + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); resultList = baseDao.selectArticleListForAgency(tokenDto.getCustomerId(), formDTO.getTagIdList(), gridList); } else { Set gridList = new HashSet<>(); if (null != userInfo.getGridIdList()) { gridList = userInfo.getGridIdList(); } + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); resultList = baseDao.selectArticleListForAgency(tokenDto.getCustomerId(), formDTO.getTagIdList(), gridList); } resultList.forEach(result -> { @@ -632,8 +633,6 @@ public class ArticleServiceImpl extends BaseServiceImpl roles = epmetUserOpenFeignClient.getStaffRoles(tokenDto.getUserId()).getData(); LoginUserDetailsFormDTO loginUserDetailsFormDTO = new LoginUserDetailsFormDTO(); loginUserDetailsFormDTO.setApp(tokenDto.getApp()); @@ -656,9 +655,11 @@ public class ArticleServiceImpl extends BaseServiceImpl gridList = new HashSet<>(); + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); resultList = baseDao.selectOfflineList(gridList); } PageInfo pageInfo = new PageInfo<>(resultList);