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