Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml

@@ -488,7 +488,7 @@
         resi_topic topic LEFT JOIN resi_group groupp ON topic.group_id = groupp.ID AND groupp.del_flag = '0' AND groupp.customer_id = #{customerId}
         WHERE
         topic.del_flag = '0'
-        and topic`STATUS`!='hidden'
+        and topic.`STATUS`!='hidden'
         AND
         topic.id IN (
         SELECT  DISTINCT topic_id  FROM resi_topic_comment  WHERE

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java

@@ -101,7 +101,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         if (!CollectionUtils.isEmpty(noOpenBadge)){
             userBadgeListResultDTOS.addAll(noOpenBadge);
         }
-        return userBadgeListResultDTOS.stream().sorted(Comparator.comparing(UserBadgeListResultDTO::getIsOpened).reversed().thenComparing(UserBadgeListResultDTO::getUpdatedTime).reversed().thenComparing(UserBadgeListResultDTO::getSort)).collect(Collectors.toList());
+        return userBadgeListResultDTOS.stream().sorted(Comparator.comparing(UserBadgeListResultDTO::getIsOpened,Comparator.reverseOrder()).thenComparing(UserBadgeListResultDTO::getUpdatedTime,Comparator.reverseOrder()).thenComparing(UserBadgeListResultDTO::getSort)).collect(Collectors.toList());
     }
 
     /**