libo 4 년 전
부모
커밋
3ce8e3a6e0

+ 5 - 1
src/main/java/com/tdba/cxb/ares/api/controller/UserController.java

@@ -89,7 +89,11 @@ public class UserController {
89
     @GetMapping("data_total")
89
     @GetMapping("data_total")
90
     public TDBAResponse data_total(BaseUser baseUser){
90
     public TDBAResponse data_total(BaseUser baseUser){
91
         Objects.requireNonNull(baseUser, "请登录后操作");
91
         Objects.requireNonNull(baseUser, "请登录后操作");
92
-        return buildSuccess(userService.dataTotal(baseUser).stream().collect(Collectors.toMap(DataTotalResp::getUser_type, DataTotalResp::getCount)));
92
+        Map<Integer, Integer> result = userService.dataTotal(baseUser).stream().collect(Collectors.toMap(DataTotalResp::getUser_type, DataTotalResp::getCount));
93
+        if(result.isEmpty()){
94
+            result = Map.of(0, 0, 1, 0, 2, 0, 3, 0);
95
+        }
96
+        return buildSuccess(result);
93
     }
97
     }
94
 
98
 
95
     @GetMapping("data_list")
99
     @GetMapping("data_list")

+ 1 - 1
src/main/java/com/tdba/cxb/ares/api/util/BaseUserArgumentResolver.java

@@ -34,7 +34,7 @@ public class BaseUserArgumentResolver implements HandlerMethodArgumentResolver {
34
         if((null != parameter) && parameter.getParameterType().equals(BaseUser.class)){
34
         if((null != parameter) && parameter.getParameterType().equals(BaseUser.class)){
35
             String token = webRequest.getNativeRequest(HttpServletRequest.class).getHeader("X-Token");
35
             String token = webRequest.getNativeRequest(HttpServletRequest.class).getHeader("X-Token");
36
             BaseUser baseuser = null;
36
             BaseUser baseuser = null;
37
-            if (StringUtils.hasLength(token)) {
37
+            if (StringUtils.hasText(token)) {
38
                 baseuser = BaseUser.BaseUserBuilder.aBaseUser()
38
                 baseuser = BaseUser.BaseUserBuilder.aBaseUser()
39
                         .withId(JwtUtil.resolveUserId(token))
39
                         .withId(JwtUtil.resolveUserId(token))
40
                         .build();
40
                         .build();