From f3e1ffd68529c29e3d4cc9c2f3e9e848fe7ce604 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Tue, 9 Jun 2020 14:10:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=88=97=E8=A1=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/DraftController.java    |  2 +-
 .../src/main/java/com/epmet/dao/ArticleDao.java  |  6 +++---
 .../src/main/resources/mapper/ArticleDao.xml     | 16 +++++++++++-----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/DraftController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/DraftController.java
index 3656c16f6e..89acd7d3d2 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/DraftController.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/DraftController.java
@@ -115,7 +115,7 @@ public class DraftController {
 
     @PostMapping("draftlist")
     @RequirePermission(requirePermission = RequirePermissionEnum.WORK_PARTY_VOICE_DRAFT_LIST)
-    public Result<List<DraftListResultDTO>> draftList(@LoginUser TokenDto tokenDto, DraftListFormDTO formDTO) {
+    public Result<List<DraftListResultDTO>> draftList(@LoginUser TokenDto tokenDto, @RequestBody DraftListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         return new Result<List<DraftListResultDTO>>().ok(draftService.draftList(tokenDto, formDTO).getList());
     }
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java
index a09cc3927d..f444f878f7 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java
@@ -83,9 +83,9 @@ public interface ArticleDao extends BaseDao<ArticleEntity> {
 	 * @param gridList
 	 * @return java.util.List<com.epmet.dto.result.PublishedListResultDTO>
 	 */
-	@DataFilter(tableAliases = {"a", "apr"}, gridIdsArgName = "gridList")
 	List<PublishedListResultDTO> selectArticleListForGrid(@Param("customerId") String customerId,
-														  @Param("tagIdList") List<String> tagIdList, Set<String> gridList);
+														  @Param("tagIdList") List<String> tagIdList,
+														  @Param("gridList")Set<String> gridList);
 
 	/**
 	 * 已下线文章列表
@@ -94,7 +94,7 @@ public interface ArticleDao extends BaseDao<ArticleEntity> {
 	 * @param gridList
 	 * @return java.util.List<com.epmet.dto.result.OfflineListResultDTO>
 	 */
-	@DataFilter(tableAliases = "apr", gridIdsArgName = "gridList")
+	@DataFilter(tableAliases = "a", gridIdsArgName = "gridList")
 	List<OfflineListResultDTO> selectOfflineList(Set<String> gridList);
 
 
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 d3be4c7e2f..42ba89d7fc 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
@@ -96,6 +96,9 @@
         WHERE a.DEL_FLAG = '0'
           AND a.STATUS_FLAG = 'published'
           AND a.CUSTOMER_ID = #{customerId}
+        <foreach item="gridId" collection="gridList" open="AND (" separator="or" close=")" index="">
+            a.GRID_ID = #{gridId}
+        </foreach>
         UNION
         SELECT DISTINCT
             aa.ID AS "articleId",
@@ -109,7 +112,11 @@
                  INNER JOIN article_publish_range apr ON aa.ID = apr.ARTICLE_ID AND apr.DEL_FLAG = 0 AND apr.PUBLISH_STATUS = 'published'
         WHERE aa.DEL_FLAG = '0'
           AND aa.STATUS_FLAG = 'published'
-          AND aa.CUSTOMER_ID = #{customerId}) t
+          AND aa.CUSTOMER_ID = #{customerId}
+        <foreach item="gridId" collection="gridList" open="AND (" separator="or" close=")" index="">
+            apr.GRID_ID = #{gridId}
+        </foreach>
+            ) t
         <if test="tagIdList !=null and tagIdList.size() > 0">
             AND EXISTS (
             SELECT DISTINCT
@@ -131,12 +138,11 @@
             a.TITLE AS "title",
             IFNULL(a.PREVIEW_CONTENT, "") AS "previewContent",
             a.PUBLISHER_NAME AS "publisherName",
-            a.PUBLISH_DATE AS "publishDate"
+            a.OFF_LINE_TIME AS "publishDate"
         FROM article a
-        INNER JOIN article_publish_range apr ON a.ID = apr.ARTICLE_ID AND  apr.DEL_FLAG = '0'
         WHERE a.DEL_FLAG = '0'
-          AND apr.PUBLISH_STATUS = 'offline'
-        ORDER BY apr.OFF_LINE_TIME DESC
+          AND a.STATUS_FLAG = 'offline'
+        ORDER BY a.OFF_LINE_TIME DESC
     </select>