发布范围

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);
+
 }

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);
 }

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);
 		}

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>

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>