Merge remote-tracking branch 'origin/dev_issue_category' into dev_issue_category

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java

@@ -266,8 +266,10 @@ public class IssueProjectTagDictRedis {
 
         List<IssueProjectTagDictEntity> db = new LinkedList<>();
 
+		CategoryTagInitFormDTO customerIdParam = new CategoryTagInitFormDTO();
+		customerIdParam.setCustomerId(customerId);
+		if (!CollectionUtils.isEmpty(redisUtils.keys(GovIssueRedisKeys.getGovernmentTagKey(customerId, null)))){
         	if(CollectionUtils.isEmpty(preResult) || CollectionUtils.isEmpty(preResult.get(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME))) {
-            CategoryTagInitFormDTO customerIdParam = new CategoryTagInitFormDTO(); customerIdParam.setCustomerId(customerId);
 				if (ifOtherOnly || CollectionUtils.isEmpty(category)) {
 					//补偿全部默认标签
 					categoryDictService.init(customerIdParam);
@@ -282,6 +284,12 @@ public class IssueProjectTagDictRedis {
 									}
 							}
         		}
+		}else{
+			if (NumConstant.ZERO <= poolDao.selectCountByCustomerId(customerId)) {
+				categoryDictService.init(customerIdParam);
+			}
+			db.addAll(poolDao.selectTagListByCustomer(customerId));
+		}
 
         if(CollectionUtils.isEmpty(preResult) || CollectionUtils.isEmpty(preResult.get(ModuleConstants.CUSTOMIZED_TAG_CATEGORY_NAME))){
             //先去数据库查询自定义，为空则是最终结果，不为空则补偿