From b6bc88db449654ad19b0cc7493227dfc9f9cd34c Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Wed, 10 Jun 2020 16:30:42 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/ArticleServiceImpl.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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 830360d1d5..5c6ea79c37 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
@@ -922,7 +922,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		}
 
 		if (!isOk) {
-			this.sendMsg(draftEntity.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draftEntity.getTitle()));
+			this.sendMsg(draftEntity.getCustomerId(),draftEntity.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draftEntity.getTitle()));
 			this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL);
 			return null;
 		}
@@ -989,7 +989,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			}
 		} catch (Exception e) {
 			log.error("scanContent exception", e);
-			this.sendMsg(draftEntity.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draftEntity.getTitle()));
+			this.sendMsg(draftEntity.getCustomerId(),draftEntity.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draftEntity.getTitle()));
 			this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL);
 		}
 		log.debug("scanContent result:{}", JSON.toJSONString(result));
@@ -1025,7 +1025,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			}
 		} catch (Exception e) {
 			log.error("scanAllPassPublishArticle update db exception", e);
-			this.sendMsg(draft.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draft.getTitle()));
+			this.sendMsg(draft.getCustomerId(),draft.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draft.getTitle()));
 			this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL);
 			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
 		}
@@ -1058,7 +1058,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			});
 		} catch (Exception e) {
 			log.error("scanAllPassPublishArticle update db exception", e);
-			this.sendMsg(draft.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draft.getTitle()));
+			this.sendMsg(draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draft.getTitle()));
 			this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL);
 			throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(), EpmetErrorCode.SERVER_ERROR.getMsg());
 		}
@@ -1069,9 +1069,9 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		return this.saveOrUpdateContent(tokenDto, fromDTO, false);
 	}
 
-	public Result sendMsg(String title,String content) {
+	public Result sendMsg(String customerId, String title,String content) {
 		UserMessageFormDTO formDTO = new UserMessageFormDTO();
-		formDTO.setCustomerId(loginUserUtil.getLoginUserApp());
+		formDTO.setCustomerId(customerId);
 		formDTO.setGridId("");
 		formDTO.setUserId(loginUserUtil.getLoginUserId());
 		formDTO.setApp(AppClientConstant.APP_GOV);

From fcbe9084cd2a6991786b78e3a8014968cf6afb59 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Wed, 10 Jun 2020 16:41:02 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ArticleServiceImpl.java      |  4 +--
 .../src/main/resources/mapper/ArticleDao.xml  | 36 +++++++++----------
 2 files changed, 18 insertions(+), 22 deletions(-)

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 5c6ea79c37..59a0a858ea 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
@@ -195,8 +195,8 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			draftEntity.setCustomerId(tokenDto.getCustomerId());
 			draftEntity.setIsTop(DraftConstant.UN_TOP);
 			draftEntity.setStatusFlag(DraftConstant.UNPUBLISH);
-			String orgIdPath = loginUserDetails.getData().getOrgIdPath();
-			String agencyId = orgIdPath.split(":")[orgIdPath.split(":").length - 1];
+			String[] orgIdPath = loginUserDetails.getData().getOrgIdPath().split(":");
+			String agencyId = orgIdPath[orgIdPath.length - 1];
 			draftEntity.setOrgId(agencyId);
 			draftEntity.setOrgIdPath(loginUserDetails.getData().getOrgIdPath());
 			draftEntity.setGridId("");
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml
index 933859cbae..f8fa5f43a7 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml
@@ -60,19 +60,16 @@
           AND a.STATUS_FLAG = 'published'
           AND a.CUSTOMER_ID = #{customerId}
           <if test="tagIdList !=null and tagIdList.size() > 0">
-              AND EXISTS (
-              SELECT DISTINCT
-              at.ARTICLE_ID
-              FROM article_tags at
-              WHERE at.DEL_FLAG = '0'
-              AND at.ARTICLE_ID = a.ID
-              <foreach item="tagId" collection="tagIdList" open="AND (" separator="and" close=")" index="">
-                  at.TAG_ID = #{tagId}
+              <foreach collection="tagIdList" item="tagId"  separator=" ">
+                  AND EXISTS(
+                  SELECT 1
+                  FROM ARTICLE_TAGS
+                  WHERE DEL_FLAG = '0'
+                  AND ARTICLE_ID = a.ID
+                  AND TAG_ID=#{tagId}
+                  )
               </foreach>
-              )
           </if>
-
-
         ORDER BY PUBLISH_DATE DESC, UPDATED_TIME DESC
     </select>
     <select id="selectArticleListForGrid" resultType="com.epmet.dto.result.PublishedListResultDTO">
@@ -118,16 +115,15 @@
         </foreach>
             ) t
         <if test="tagIdList !=null and tagIdList.size() > 0">
-            AND EXISTS (
-            SELECT DISTINCT
-            at.ARTICLE_ID
-            FROM article_tags at
-            WHERE at.DEL_FLAG = '0'
-            AND at.ARTICLE_ID = t.articleId
-            <foreach item="tagId" collection="tagIdList" open="AND (" separator="and" close=")" index="">
-                at.TAG_ID = #{tagId}
+            <foreach collection="tagIdList" item="tagId"  separator=" ">
+                AND EXISTS(
+                SELECT 1
+                FROM ARTICLE_TAGS
+                WHERE DEL_FLAG = '0'
+                AND ARTICLE_ID = a.ID
+                AND TAG_ID=#{tagId}
+                )
             </foreach>
-            )
         </if>
         ORDER BY publishDate DESC, UPDATED_TIME DESC
     </select>

From 660b7f204548192639470727da75e72cfc171435 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Wed, 10 Jun 2020 16:41:07 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ArticleServiceImpl.java      | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

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 5c6ea79c37..18cc8e3265 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
@@ -1039,15 +1039,18 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			log.error("updateAuditStatusFailById draftId:{} is not exist in db", draftId);
 			throw new RenException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg());
 		}
+		boolean coverFail = false,contentFail = false;
 		try {
 			List<String> failDataIds = syncScanResult.getFailDataIds();
-			failDataIds.forEach(id -> {
+			for(String id:failDataIds) {
 				if (id.indexOf(ModuleConstant.SCAN_COVER_PREFIX) >= NumConstant.ZERO) {
 					draftCoverDao.updateAuditStatusById(id, ModuleConstant.AUDIT_STATUS_FAIL);
+					coverFail = true;
 				} else {
 					draftContentDao.updateAuditStatusById(id, ModuleConstant.AUDIT_STATUS_FAIL);
+					contentFail = true;
 				}
-			});
+			}
 			List<String> successDataIds = syncScanResult.getSuccessDataIds();
 			successDataIds.forEach(id -> {
 				if (id.indexOf(ModuleConstant.SCAN_COVER_PREFIX) >= 0) {
@@ -1056,6 +1059,18 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 					draftContentDao.updateAuditStatusById(id, ModuleConstant.AUDIT_STATUS_PASS);
 				}
 			});
+			if (coverFail || contentFail){
+				String auditMsg = "";
+				if (coverFail&&contentFail){
+					auditMsg = "内容和封面";
+				}else if (contentFail){
+					auditMsg = "内容";
+				}else if (coverFail){
+					auditMsg = "封面";
+				}
+				this.sendMsg(draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draft.getTitle(),auditMsg));
+				this.updateDraftPublishStatus(draftId, DraftConstant.AUDITFAIL);
+			}
 		} catch (Exception e) {
 			log.error("scanAllPassPublishArticle update db exception", e);
 			this.sendMsg(draft.getCustomerId(), draft.getTitle(), String.format(ModuleConstant.MSG_ARTICLE_PUBLISH_ERROR, draft.getTitle()));

From 559bb4c6df2cca0055020d515d11307339d9a8b5 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 10 Jun 2020 16:54:06 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=8F=AA=E6=9C=89=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83=E8=80=85=E6=89=8D=E8=83=BD=E4=B8=8B=E7=BA=BF?=
 =?UTF-8?q?=E8=87=AA=E5=B7=B1=E7=9A=84=E6=96=87=E7=AB=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/constant/ArticleConstant.java    |  8 ++++++++
 .../com/epmet/service/impl/ArticleServiceImpl.java  | 13 ++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/ArticleConstant.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/ArticleConstant.java
index c788c48844..52a64374d2 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/ArticleConstant.java
+++ b/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 = "当前人员不是文章发布者，不能下线文章";
 }
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 bac472f75e..8b33f29237 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
@@ -477,6 +477,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());
@@ -534,9 +543,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		//4:文章操作记录表新增数据
 		//4.1:调用epmet-user服务，查询工作人员信息
 		CustomerStaffDTO staffDTO = getCustomerStaff(formDTO.getStaffId());
-		//4.2:查询文章表数据
-		ArticleEntity articleEntity = baseDao.selectById(formDTO.getArticleId());
-		//4.3:新增操作表数据
+		//4.2:新增操作表数据
 		ArticleOperateRecordEntity recordEntity = new ArticleOperateRecordEntity();
 		recordEntity.setCustomerId(articleEntity.getCustomerId());
 		recordEntity.setArticleId(formDTO.getArticleId());