Merge remote-tracking branch 'origin/dev_new_article' into dev_new_article

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

@@ -1557,6 +1557,11 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 					articlePublishRange.setGridId(g);
 					articlePublishRange.setAgencyGridName(gridInfo.getGridNamePath());
 					articlePublishRange.setAgencyId(gridInfo.getPid());
+					AgencyInfoCache info = CustomerOrgRedis.getAgencyInfo(gridInfo.getPid());
+					if (null == info){
+						throw new EpmetException("未查询到组织信息:"+gridInfo.getPid());
+					}
+					articlePublishRange.setPids(info.getPids());
 					articlePublishRange.setPublishStatus(ArticleConstant.PUBLISHED);
 					articlePublishRange.setId(null);
 					rangeList.add(articlePublishRange);
@@ -1624,6 +1629,11 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 					draftPublishRange.setGridId(g);
 					draftPublishRange.setAgencyGridName(gridInfo.getGridNamePath());
 					draftPublishRange.setAgencyId(gridInfo.getPid());
+					AgencyInfoCache info = CustomerOrgRedis.getAgencyInfo(gridInfo.getPid());
+					if (null == info){
+						throw new EpmetException("未查询到组织信息:"+gridInfo.getPid());
+					}
+					draftPublishRange.setPids(info.getPids());
 					draftPublishRange.setPublishStatus(DraftConstant.UNPUBLISH);
 					draftPublishRange.setId(null);
 					rangeList.add(draftPublishRange);