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 7bd3004a1..a962d65ab 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
@@ -37,8 +37,11 @@ public class IssueAnalysisServiceImpl extends BaseServiceImpl<IssueAnalysisDao,
 	@DataSource(name = DataSourceNames.FOURTH)
 	@Override
 	public PageData<IssueResultDTO> listHottestIssue(Map<String, Object> params) {
-		UserDetail userDetail= SecurityUser.getUser();
-		params.put("deptIdList",userDetail.getDeptIdList());
+		UserDetail userDetail = SecurityUser.getUser();
+		if (null == userDetail.getDeptIdList() || userDetail.getDeptIdList().size() == 0) {
+			return new PageData<>();
+		}
+		params.put("deptIdList", userDetail.getDeptIdList());
 		IPage<IssueResultDTO> page = getPage(params);
 		List<IssueResultDTO> list = baseDao.selectListHottestIssue(params);
 		return new PageData<>(list, page.getTotal());
@@ -55,6 +58,9 @@ public class IssueAnalysisServiceImpl extends BaseServiceImpl<IssueAnalysisDao,
 	@Override
 	public PageData<IssueResultDTO> listLatestIssue(Map<String, Object> params) {
 		UserDetail userDetail = SecurityUser.getUser();
+		if (null == userDetail.getDeptIdList() || userDetail.getDeptIdList().size() == 0) {
+			return new PageData<>();
+		}
 		params.put("deptIdList", userDetail.getDeptIdList());
 		IPage<IssueResultDTO> page = getPage(params);
 		List<IssueResultDTO> list = baseDao.selectListLatestIssue(params);
@@ -71,6 +77,9 @@ public class IssueAnalysisServiceImpl extends BaseServiceImpl<IssueAnalysisDao,
 	@Override
 	public PageData<IssueClassifiedStatisticDTO> listIssueClassifiedStatistic(Map<String, Object> params) {
 		UserDetail userDetail = SecurityUser.getUser();
+		if (null == userDetail.getDeptIdList() || userDetail.getDeptIdList().size() == 0) {
+			return new PageData<>();
+		}
 		params.put("deptIdList", userDetail.getDeptIdList());
 		if (StringUtils.isBlank((String) params.get("categoryLevel"))) {
 			params.put("categoryLevel", "1");
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java
index 9c20b53b5..20355e29f 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java
@@ -34,6 +34,9 @@ public class ItemAnalysisServiceImpl extends BaseServiceImpl<ItemAnalysisDao, It
 	@Override
 	public PageData<ItemResultDTO> listItemResultDTO(Map<String, Object> params) {
 		UserDetail userDetail = SecurityUser.getUser();
+		if (null == userDetail.getDeptIdList() || userDetail.getDeptIdList().size() == 0) {
+			return new PageData<>();
+		}
 		params.put("deptIdList", userDetail.getDeptIdList());
 		IPage<ItemResultDTO> page = getPage(params);
 		List<ItemResultDTO> list = baseDao.selectListHottestItemResultDTO(params);
@@ -51,6 +54,9 @@ public class ItemAnalysisServiceImpl extends BaseServiceImpl<ItemAnalysisDao, It
 	@DataSource(name = DataSourceNames.FOURTH)
 	public PageData<UnsolvedItemResultDTO> listUnsolvedItemResultDTO(Map<String, Object> params) {
 		UserDetail userDetail = SecurityUser.getUser();
+		if (null == userDetail.getDeptIdList() || userDetail.getDeptIdList().size() == 0) {
+			return new PageData<>();
+		}
 		params.put("deptIdList", userDetail.getDeptIdList());
 		IPage<UnsolvedItemResultDTO> page = getPage(params);
 		List<UnsolvedItemResultDTO> list = baseDao.selectListUnsolvedItemResultDTO(params);
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 8924eda8d..7d71107f3 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
@@ -34,6 +34,9 @@ public class TopicAnalysisServiceImpl extends BaseServiceImpl<TopicAnalysisDao,
 	@Override
 	public PageData<TopicResultDTO> listHottestTopic(Map<String, Object> params) {
 		UserDetail userDetail = SecurityUser.getUser();
+		if (null == userDetail.getDeptIdList() || userDetail.getDeptIdList().size() == 0) {
+			return new PageData<>();
+		}
 		params.put("deptIdList", userDetail.getDeptIdList());
 		IPage<TopicResultDTO> page = getPage(params);
 		List<TopicResultDTO> list = baseDao.selectListHottestTopicDTO(params);
@@ -51,11 +54,13 @@ public class TopicAnalysisServiceImpl extends BaseServiceImpl<TopicAnalysisDao,
 	@Override
 	public PageData<TopicResultDTO> listLatestTopic(Map<String, Object> params) {
 		UserDetail userDetail = SecurityUser.getUser();
+		if (null == userDetail.getDeptIdList() || userDetail.getDeptIdList().size() == 0) {
+			return new PageData<>();
+		}
 		params.put("deptIdList", userDetail.getDeptIdList());
 		IPage<TopicResultDTO> page = getPage(params);
 		List<TopicResultDTO> list = baseDao.selectListLatesttTopicDTO(params);
 		return new PageData<>(list, page.getTotal());
 	}
 
-
 }