Merge remote-tracking branch 'remotes/origin/dev'

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

@@ -108,9 +108,11 @@ public class IssueProjectTagDictRedis {
         Map<String,List<IssueCategoryTagResultDTO>> result = new HashMap<>();
         //传入的categories不会只包含"其他"这个分类，因为情况下ifOtherOnly为true，直接传入null
         List<IssueCategoryTagResultDTO> _default = poolDao.selectDefault(customerId,ifOtherOnly ? null : category);
-        if(!CollectionUtils.isEmpty(_default)){
-            result.put(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME,_default);
-        }else log.error("there is no default tag data in database , customerId : {}",customerId);
+        if (!CollectionUtils.isEmpty(_default)) {
+            result.put(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME, _default);
+        } else {
+            log.error("there is no default tag data in database , customerId : {},category:{}", customerId, ifOtherOnly ? null : category);
+        }
 
 
         //如果keys集合为空，说明缓存中没有当前客户的标签排行信息，直接进行补偿
@@ -441,7 +443,7 @@ public class IssueProjectTagDictRedis {
         secondCategoryIds.forEach(cid -> {
             String key = GovIssueRedisKeys.getGovernmentTagKey(customerId, cid);
 
-            Set<ZSetOperations.TypedTuple<Object>> tagTuples = 
+            Set<ZSetOperations.TypedTuple<Object>> tagTuples =
                     redisUtils.zReverseRangeWithScores(key, NumConstant.ZERO_L, (long) (NumConstant.ONE_NEG));
 
             if(!CollectionUtils.isEmpty(tagTuples)){
@@ -477,4 +479,4 @@ public class IssueProjectTagDictRedis {
         T t = objectMapper.convertValue(o, clazz);
         return t;
     }
-}
+}