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

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/ArticleConstant.java

@@ -44,4 +44,12 @@ public interface ArticleConstant {
      * 发布文章操作记录表文案
      */
     String PUBLISH_ARTICLE_MSG = "%s-%s发布文章【%s】";
+    /**
+     * 查询文章基本信息失败
+     */
+    String SELECT_ARTICLE_EXCEPTION = "获取文章信息失败";
+    /**
+     * 操作权限异常-自己发表的文章只有自己才能下线
+     */
+    String SHIRO_EXCEPTION = "当前人员不是文章发布者，不能下线文章";
 }

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

@@ -484,6 +484,15 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void offLineArticle(OffLineArticleFormDTO formDTO) {
+        //0:查询文章表数据，判断当前操作人是否是当初发表文章的人（谁发布的文章水才能下线）
+        ArticleEntity articleEntity = baseDao.selectById(formDTO.getArticleId());
+        if (null == articleEntity) {
+            throw new RenException(ArticleConstant.SELECT_ARTICLE_EXCEPTION);
+        }
+        if(!formDTO.getStaffId().equals(articleEntity.getCreatedBy())){
+            throw new RenException(ArticleConstant.SHIRO_EXCEPTION);
+        }
+
 		//1:根据文章Id查询全部（已发布、已下线）发布范围数据
 		ArticlePublishRangeEntity rangeEntity = new ArticlePublishRangeEntity();
 		rangeEntity.setArticleId(formDTO.getArticleId());
@@ -541,9 +550,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		//4:文章操作记录表新增数据
 		//4.1:调用epmet-user服务，查询工作人员信息
 		CustomerStaffDTO staffDTO = getCustomerStaff(formDTO.getStaffId());
-		//4.2:查询文章表数据
+		//4.2:新增操作表数据
-		ArticleEntity articleEntity = baseDao.selectById(formDTO.getArticleId());
-		//4.3:新增操作表数据
 		ArticleOperateRecordEntity recordEntity = new ArticleOperateRecordEntity();
 		recordEntity.setCustomerId(articleEntity.getCustomerId());
 		recordEntity.setArticleId(formDTO.getArticleId());