From 19c22f1a8f7635271cc1a37b07b5c756efc4288f Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 12 Feb 2020 08:44:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/issue/service/impl/IssueAnalysisServiceImpl.java | 2 ++
 .../modules/topic/service/impl/TopicAnalysisServiceImpl.java | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java
index 953727b22..8d5078b18 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/issue/service/impl/IssueAnalysisServiceImpl.java
@@ -119,6 +119,8 @@ public class IssueAnalysisServiceImpl extends BaseServiceImpl<IssueAnalysisDao,
 
 	@Override
 	public List<NewIssueResultDTO> getNewIssueList(NewIssueFormDTO formDto) {
+		int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize();
+		formDto.setPageIndex(pageIndex);
 		List<NewIssueResultDTO> list = baseDao.selectNewIssueList(formDto);
 		return list;
 	}
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicAnalysisServiceImpl.java
index 590bbfc03..9cb68f493 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicAnalysisServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/topic/service/impl/TopicAnalysisServiceImpl.java
@@ -2,6 +2,7 @@ package com.elink.esua.epdc.modules.topic.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
@@ -76,6 +77,8 @@ public class TopicAnalysisServiceImpl extends BaseServiceImpl<TopicAnalysisDao,
 	 */
 	@Override
 	public Result getHotTopicList(HotTopicFormDTO hotTopicFormDTO){
+		int pageIndex = (hotTopicFormDTO.getPageIndex() - NumConstant.ONE) * hotTopicFormDTO.getPageSize();
+		hotTopicFormDTO.setPageIndex(pageIndex);
 		hotTopicFormDTO.setDeptIdList(SecurityUser.getUser().getDeptIdList());
 		List<HotTopicResultDTO> list = baseDao.selectHotTopicList(hotTopicFormDTO);
 		return new Result().ok(list);
@@ -89,6 +92,8 @@ public class TopicAnalysisServiceImpl extends BaseServiceImpl<TopicAnalysisDao,
 	 */
 	@Override
 	public Result getNewTopicList(NewHotTopicFormDTO newHotTopicFormDTO){
+		int pageIndex = (newHotTopicFormDTO.getPageIndex() - NumConstant.ONE) * newHotTopicFormDTO.getPageSize();
+		newHotTopicFormDTO.setPageIndex(pageIndex);
 		newHotTopicFormDTO.setDeptIdList(SecurityUser.getUser().getDeptIdList());
 		List<NewHotTopicResultDTO> list = baseDao.selectNewHotTopicList(newHotTopicFormDTO);
 		return new Result().ok(list);