Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into yantai_zhengwu_master

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java

@@ -2015,18 +2015,12 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 	 */
 	@Override
 	public PageData<ArticleLatestResultDTO> pageArticleListByTagName(Integer pageNo, Integer pageSize, String gridId, String tagName) {
-		// 1.获取工作人员缓存信息
-		CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(),
-				EpmetRequestHolder.getLoginUserId());
-		if (null == staffInfo) {
-			throw new EpmetException("获取工作人员信息失败");
-		}
 		PageHelper.startPage(pageNo, pageSize);
 		List<ArticleLatestResultDTO> list = baseDao.pageArticleListByTagName(
 				gridId,
 				tagName,
 				EpmetRequestHolder.getLoginUserCustomerId(),
-				staffInfo.getAgencyId());
+				null);
 		PageInfo<ArticleLatestResultDTO> pageInfo = new PageInfo<>(list);
 		return new PageData<>(list, pageInfo.getTotal());
 	}