From 839d2cc035e06941dac758f433a10d103c81c718 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 4 Jul 2022 14:11:29 +0800
Subject: [PATCH] =?UTF-8?q?PC=E7=AB=AF=E4=B8=8B=E7=BA=BF=E4=B8=8D=E5=86=8D?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E8=87=AA=E5=B7=B1=E4=B8=8B=E8=87=AA=E5=B7=B1?=
 =?UTF-8?q?=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/controller/ArticleController.java | 2 +-
 .../main/java/com/epmet/service/impl/ArticleServiceImpl.java  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java
index 4430d1a3c3..e08c8dca5f 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java
@@ -182,7 +182,7 @@ public class ArticleController {
 	 * @Description 党建声音-政府端-下线文章
 	 **/
 	@PostMapping("offlinearticle")
-	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_OFFLINE)
+	//@RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_OFFLINE)
 	public Result offLineArticle(@LoginUser TokenDto tokenDTO, @RequestBody OffLineArticleFormDTO formDTO) {
 		formDTO.setStaffId(tokenDTO.getUserId());
 		ValidatorUtils.validateEntity(formDTO, OffLineArticleFormDTO.AddUserInternalGroup.class);
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
index bf06c682c9..b040850216 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java
@@ -499,9 +499,11 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		if (null == articleEntity) {
 			throw new RenException(ArticleConstant.SELECT_ARTICLE_EXCEPTION);
 		}
+		/*
+		//2022.7.4  pc端下线文章不再限制自己下自己的
 		if (!formDTO.getStaffId().equals(articleEntity.getCreatedBy())) {
 			throw new RenException(ArticleConstant.SHIRO_EXCEPTION);
-		}
+		}*/
 
 		//1:根据文章Id查询全部（已发布、已下线）发布范围数据
 		ArticlePublishRangeEntity rangeEntity = new ArticlePublishRangeEntity();