From 8ef17e73b4f8e3ca60f6770a254f1674c8853807 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 29 九月 2022 10:59:30 +0800
Subject: [PATCH] update

---
 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java
index d52071f..fdc1649 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java
@@ -36,6 +36,8 @@
 import com.panzhihua.common.model.vos.R;
 import com.panzhihua.common.service.user.UserService;
 
+import static java.util.Objects.nonNull;
+
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
  * @description: 登录认证
@@ -102,9 +104,11 @@
             // 维护最后登录时间
             userService.putUserLastLoginTime(loginUserInfoVO.getUserId());
             //是否为专家登陆
-            R r1 = communityService.isExpert(loginUserInfoVO.getPhone());
-            if (r1.getCode()== Constants.SUCCESS){
-                loginUserInfoVO.setType(13);
+            if (nonNull(loginUserInfoVO.getPhone())){
+                R r1 = communityService.isExpert(loginUserInfoVO.getPhone());
+                if (r1.getCode()== Constants.SUCCESS){
+                    loginUserInfoVO.setType(13);
+                }
             }
             return new UsernamePasswordAuthenticationToken(loginUserInfoVO, password, grantedAuthorityList);
         }
@@ -136,9 +140,11 @@
             // 维护最后登录时间
             userService.putUserLastLoginTime(loginUserInfoVO.getUserId());
             //是否为专家登陆
-            R r1 = communityService.isExpert(loginUserInfoVO.getPhone());
-            if (r1.getCode()== Constants.SUCCESS){
-                loginUserInfoVO.setType(13);
+            if (nonNull(loginUserInfoVO.getPhone())){
+                R r1 = communityService.isExpert(loginUserInfoVO.getPhone());
+                if (r1.getCode()== Constants.SUCCESS){
+                    loginUserInfoVO.setType(13);
+                }
             }
             return new UsernamePasswordAuthenticationToken(loginUserInfoVO, password, grantedAuthorityList);
 

--
Gitblit v1.7.1