Merge remote-tracking branch 'origin/dev'

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/redis/ResiGroupRedis.java

@@ -2,6 +2,7 @@ package com.epmet.dataaggre.redis;
 
 import com.epmet.commons.tools.redis.RedisUtils;
 import com.epmet.dataaggre.constant.GroupConstant;
+import com.epmet.dto.form.UserBadgeUnitFormDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -36,8 +37,8 @@ public class ResiGroupRedis {
         if (!CollectionUtils.isEmpty(result)){
             List<String> icons = new ArrayList<>();
             for (Object o : result) {
-                Map<String,String> map = (Map<String, String>) o;
-                icons.add(map.get(GroupConstant.BADGE_ICON));
+                UserBadgeUnitFormDTO map = (UserBadgeUnitFormDTO) o;
+                icons.add(map.getBadgeIcon());
             }
             return icons;
         }