徽章修改

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

@@ -136,11 +136,10 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         Map<String, List<UserOperListResultDTO>> collect = userOperListResultDTOS.stream().collect(Collectors.groupingBy(UserOperListResultDTO::getIsLighted));
         List<UserOperListResultDTO> result = collect.get(BadgeConstant.YES);
         List<UserOperListResultDTO> noLight = collect.get(BadgeConstant.NO);
-        if (CollectionUtils.isEmpty(noLight)){
+        List<UserOperListResultDTO> resultFin = new ArrayList<>();
-            return result;
+        resultFin.addAll(CollectionUtils.isEmpty(result)?new ArrayList<>():result);
-        }
+        resultFin.addAll(CollectionUtils.isEmpty(noLight)?new ArrayList<>():noLight.stream().sorted(Comparator.comparing(UserOperListResultDTO::getSort)).collect(Collectors.toList()));
-        result.addAll(noLight.stream().sorted(Comparator.comparing(UserOperListResultDTO::getSort)).collect(Collectors.toList()));
+        return resultFin;
-        return result;
     }
 
     /**