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

5 years ago · 61022be3e9
1 changed files with 3 additions and 1 deletions
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java
@ -98,7 +98,9 @@ public class UserBadgeServiceImpl implements UserBadgeService {
                noOpenBadge.add(u);
            }
        });
-        userBadgeListResultDTOS.addAll(noOpenBadge.stream().sorted(Comparator.comparing(UserBadgeListResultDTO::getSort)).collect(Collectors.toList()));
+        if (!CollectionUtils.isEmpty(noOpenBadge)){
+            userBadgeListResultDTOS.addAll(noOpenBadge.stream().sorted(Comparator.comparing(UserBadgeListResultDTO::getSort)).collect(Collectors.toList()));
+        }
        return userBadgeListResultDTOS;
    }