Ver código fonte

top10是否关注

sunkean 3 anos atrás
pai
commit
1fccc28e73

+ 6 - 5
src/main/java/com/izouma/nineth/web/UserController.java

@@ -34,10 +34,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 
 @AllArgsConstructor
 @AllArgsConstructor
 @RestController
 @RestController
@@ -434,15 +431,19 @@ public class UserController extends BaseController {
 
 
     @GetMapping("/topTen")
     @GetMapping("/topTen")
     public List<User> topTen() {
     public List<User> topTen() {
-        Long id = SecurityUtils.getAuthenticatedUser().getId();
+
         LocalDateTime time = LocalDateTime.now().plusDays(-7);
         LocalDateTime time = LocalDateTime.now().plusDays(-7);
         List<Map<String, String>> map = tokenHistoryRepo.top(time);
         List<Map<String, String>> map = tokenHistoryRepo.top(time);
         JSONArray jsonArray = new JSONArray();
         JSONArray jsonArray = new JSONArray();
         jsonArray.addAll(map);
         jsonArray.addAll(map);
         List<User> users = jsonArray.toJavaList(User.class);
         List<User> users = jsonArray.toJavaList(User.class);
+        if (Objects.isNull(SecurityUtils.getAuthenticatedUser())) {
+            return users;
+        }
         if (CollectionUtils.isEmpty(users)) {
         if (CollectionUtils.isEmpty(users)) {
             return users;
             return users;
         }
         }
+        Long id = SecurityUtils.getAuthenticatedUser().getId();
         users.forEach(user -> {
         users.forEach(user -> {
             List<Follow> follows = followRepo.findByUserIdAndFollowUserId(id, user.getId());
             List<Follow> follows = followRepo.findByUserIdAndFollowUserId(id, user.getId());
             if (CollectionUtils.isNotEmpty(follows)) {
             if (CollectionUtils.isNotEmpty(follows)) {