libo 4 yıl önce
ebeveyn
işleme
889e7b1f57

+ 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.hasText(token)) {
37
+            if (StringUtils.hasText(token) && !"null".equals(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();