From ad202471862a8e529ebfbc8a6e5e8cc46055aeae Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Mon, 8 Jun 2020 10:32:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/constant/TagConstant.java  |  2 ++
 .../com/epmet/service/impl/ArticleServiceImpl.java | 14 +++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/TagConstant.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/TagConstant.java
index 978a9ab394..494ec2c154 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/TagConstant.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/TagConstant.java
@@ -44,6 +44,8 @@ public interface TagConstant {
     String SUCCESS_UPDATE = "更新标签缓存成功... ...";
     String FAILURE_UPDATE = "更新标签缓存失败... ...";
 
+    String SELECT_GRIDIDLIST_FAILURE = "查询gridId集合数量为0";
+
 
 
 }
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 36f47c9fc0..5a2b58c338 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
@@ -890,7 +890,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 	}
 
 	/**
-	 * @Description  更新DB的标签使用次数
+	 * @Description  更新DB的标签使用次数		政府端
 	 * @param draftId
 	 * @author zxc
 	 */
@@ -903,7 +903,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		String userId = tokenDto.getUserId();
 		List<String> tagsList = Arrays.asList(tags.split("\\|"));
 		List<UpdateTagUseCountsResultDTO> tagsInfo = new ArrayList<>();
-		//政府端的 标签使用次数  DB和redis更新(zSet)
+		//政府端的 标签使用次数  DB
 		for (String tag : tagsList) {
 			UpdateTagUseCountsResultDTO updateTagUseCount = tagCustomerService.checkTagInfo(tag, customerId, userId);
 			tagsInfo.add(updateTagUseCount);
@@ -915,7 +915,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 	}
 
 	/**
-	 * @Description  更新redis    标签使用数量 和 标签级联
+	 * @Description  更新redis    标签使用数量 和 标签级联			政府端
 	 * @param formDto
 	 * @author zxc
 	 */
@@ -941,7 +941,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 	}
 
 	/**
-	 * @Description  更新数据库	网格下的标签使用数量
+	 * @Description  更新数据库	网格下的标签使用数量		居民端
 	 * @param draftId
 	 * @param formDto
 	 * @author zxc
@@ -953,7 +953,11 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 		String customerId = draft.getCustomerId();
 		List<UpdateTagUseCountsResultDTO> tagsInfo = formDto.getTagsInfo();
 		String userId = tokenDto.getUserId();
+		//根据草稿id查询发布范围id集合
 		List<String> gridIds = articlePublishRangeDao.selectGridIdByDraftId(draftId);
+		if (gridIds.size() == NumConstant.ZERO){
+			throw new RenException(TagConstant.SELECT_GRIDIDLIST_FAILURE);
+		}
 		List<UpdateGridTagsFormDTO> gridTags = new ArrayList<>();
 		List<UpdateGridTagCacheDTO> gridTagCache = new ArrayList<>();
 		for (String gridId : gridIds) {
@@ -976,7 +980,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 	}
 
 	/**
-	 * @Description  更新redis    网格下的 标签使用数量 和 级联标签
+	 * @Description  更新redis    网格下的 标签使用数量 和 级联标签	居民端
 	 * @param gridTagCache
 	 * @author zxc
 	 */