From 872bf29f65ea2e3da51af2123d898c6b8c1997a9 Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Wed, 10 Jun 2020 11:23:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dao/ArticlePublishRangeDao.java |  7 +------
 .../java/com/epmet/dao/DraftPublishRangeDao.java   |  7 +++++++
 .../com/epmet/service/impl/ArticleServiceImpl.java |  2 +-
 .../resources/mapper/ArticlePublishRangeDao.xml    | 14 +-------------
 .../main/resources/mapper/DraftPublishRangeDao.xml | 14 ++++++++++++++
 5 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticlePublishRangeDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticlePublishRangeDao.java
index 3cae2f1f35..9d9ffa0830 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticlePublishRangeDao.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticlePublishRangeDao.java
@@ -42,10 +42,5 @@ public interface ArticlePublishRangeDao extends BaseDao<ArticlePublishRangeEntit
      **/
     List<ArticlePublishRangeEntity> selectByArticleId(ArticlePublishRangeEntity rangeEntity);
 
-    /**
-     * @Description  根据草稿id查询发布范围id集合
-     * @param draftId
-     * @author zxc
-     */
-    List<String> selectGridIdByDraftId(@Param("draftId")String draftId);
+
 }
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftPublishRangeDao.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftPublishRangeDao.java
index b3da6a7c4e..7a5d41c9ea 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftPublishRangeDao.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/DraftPublishRangeDao.java
@@ -42,4 +42,11 @@ public interface DraftPublishRangeDao extends BaseDao<DraftPublishRangeEntity> {
      * @date 2020.06.05 10:28
      **/
     List<DraftPublishRangeDTO> selectByDraftId(@Param("draftId")String draftId);
+
+    /**
+     * @Description  根据草稿id查询发布范围id集合
+     * @param draftId
+     * @author zxc
+     */
+    List<String> selectGridIdByDraftId(@Param("draftId")String draftId);
 }
\ No newline at end of file
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 01694a0ffc..dad669ecd4 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
@@ -1137,7 +1137,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		List<UpdateTagUseCountsResultDTO> tagsInfo = formDto.getTagsInfo();
 		String userId = tokenDto.getUserId();
 		//根据草稿id查询发布范围id集合
-		List<String> gridIds = articlePublishRangeDao.selectGridIdByDraftId(draftId);
+		List<String> gridIds = draftPublishRangeDao.selectGridIdByDraftId(draftId);
 		if (gridIds.size() == NumConstant.ZERO){
 			throw new RenException(TagConstant.SELECT_GRIDIDLIST_FAILURE);
 		}
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticlePublishRangeDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticlePublishRangeDao.xml
index e816e10d0d..b80067be18 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticlePublishRangeDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticlePublishRangeDao.xml
@@ -19,17 +19,5 @@
         ORDER BY created_time ASC
     </select>
 
-    <!-- 根据草稿id查询发布范围id集合 -->
-    <select id="selectGridIdByDraftId" resultType="java.lang.String">
-        SELECT
-            apr.grid_id AS gridId
-        FROM
-            article_publish_range apr
-            LEFT JOIN article a ON a.id = apr.article_id
-        WHERE
-            a.del_flag = 0
-            AND apr.del_flag = 0
-            AND a.draft_id = #{draftId}
-            AND publish_status = "published"
-    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftPublishRangeDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftPublishRangeDao.xml
index afcb6f71a9..014ccbed68 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftPublishRangeDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftPublishRangeDao.xml
@@ -21,4 +21,18 @@
         AND DEL_FLAG = '0'
     </select>
 
+    <!-- 根据草稿id查询发布范围id集合 -->
+    <select id="selectGridIdByDraftId" resultType="java.lang.String">
+        SELECT
+            dpr.grid_id AS gridId
+        FROM
+            draft_publish_range dpr
+            LEFT JOIN draft d ON d.id = dpr.draft_id
+        WHERE
+            d.del_flag = 0
+            AND dpr.del_flag = 0
+            AND dpr.draft_id = #{draftId}
+            AND dpr.publish_status = "unpublish"
+    </select>
+
 </mapper>
\ No newline at end of file