shiyue 1 éve
szülő
commit
ff04d030c1

+ 8 - 3
energy-manage-service/src/main/java/com/energy/manage/service/filter/LoginVerifyInterceptor.java

@@ -99,11 +99,16 @@ public class LoginVerifyInterceptor implements HandlerInterceptor {
             if(ObjectUtils.isEmpty(userMap.get("userName"))){
                 throw new TokenInvalidException();
             }
-            Integer userId = Integer.valueOf(userMap.get("userId"));
-            devUser.setUserId(userId);
+            Integer userId = 0;
+            if(userMap.get("userId")!=null){
+                devUser.setUserId(Integer.valueOf(userMap.get("userId")));
+            }
             devUser.setUserPhone(userMap.get("userPhone"));
             devUser.setUserName(userMap.get("userName"));
-            devUser.setCurrentRoleId(Integer.valueOf(userMap.get("userRoleId")));
+            if(userMap.get("userRoleId")!=null){
+                devUser.setCurrentRoleId(Integer.valueOf(userMap.get("userRoleId")));
+            }
+
             LoginUserContextHolder.set(devUser);
         } catch (JWTDecodeException j) {
             logger.error(String.format("token:%s  ========> token异常,访问系统被拦截", token));