Merge branch 'wxz_bug_pagehelper' into dev

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<MassesDiscontentResultV2DTO> 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<MassesDiscontentResultV2DTO> list = projectDao.selectMassesDiscontentMultic(formDTO.getAgencyId(),
                 formDTO.getAreaCode(),
                 formDTO.getStartDate(),

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<CodeHistoryResultDTO> list = codeOperationHistoryService.getHistoryList(formDTO.getCustomerId(), formDTO.getClientType());
 		PageInfo<CodeHistoryResultDTO> pageInfo = new PageInfo<>(list);
 		return new PageData<>(list, pageInfo.getTotal());

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<ArticleDao, ArticleEntit
 
 	@Override
 	public PageData publishedArticleList(TokenDto tokenDto, PublishedListFormDTO formDTO) {
-		PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
 		List<PublishedListResultDTO> resultList;
 		List<CustomerStaffRoleResultDTO> roles = epmetUserOpenFeignClient.getStaffRoles(tokenDto.getUserId()).getData();
 		LoginUserDetailsFormDTO loginUserDetailsFormDTO = new LoginUserDetailsFormDTO();
@@ -612,12 +611,14 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		}
 		if (AGENCY.equals(staffLevel)) {
 			Set<String> gridList = new HashSet<>();
+			PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
 			resultList = baseDao.selectArticleListForAgency(tokenDto.getCustomerId(), formDTO.getTagIdList(), gridList);
 		} else {
 			Set<String> 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<ArticleDao, ArticleEntit
 
 	@Override
 	public PageData offlineList(TokenDto tokenDto, OfflineListFormDTO formDTO) {
-		PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
-
 		List<CustomerStaffRoleResultDTO> roles = epmetUserOpenFeignClient.getStaffRoles(tokenDto.getUserId()).getData();
 		LoginUserDetailsFormDTO loginUserDetailsFormDTO = new LoginUserDetailsFormDTO();
 		loginUserDetailsFormDTO.setApp(tokenDto.getApp());
@@ -656,9 +655,11 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			if (null != userInfo.getGridIdList()) {
 				gridList = userInfo.getGridIdList();
 			}
+			PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
 			resultList = baseDao.selectOfflineList(gridList);
 		} else {
 			Set<String> gridList = new HashSet<>();
+			PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
 			resultList = baseDao.selectOfflineList(gridList);
 		}
 		PageInfo<OfflineListResultDTO> pageInfo = new PageInfo<>(resultList);