From b5a53d719f01daac9f4b4d0aafa274cea152c92c Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 10 十一月 2022 17:43:53 +0800
Subject: [PATCH] token获取物业id处理

---
 springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 607cc69..0f8ac5c 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
@@ -109,6 +109,10 @@
                 if (r1.getCode()== Constants.SUCCESS){
                     loginUserInfoVO.setType(13);
                 }
+                R r2 = userService.propertyCheck(loginUserInfoVO.getPhone());
+                if (r2.getCode() == Constants.SUCCESS){
+                    loginUserInfoVO.setPropertyId((Long)r2.getData());
+                }
             }
             return new UsernamePasswordAuthenticationToken(loginUserInfoVO, password, grantedAuthorityList);
         }
@@ -144,10 +148,6 @@
                 R r1 = communityService.isExpert(loginUserInfoVO.getPhone());
                 if (r1.getCode() == Constants.SUCCESS){
                     loginUserInfoVO.setType(13);
-                }
-                R r2 = userService.propertyCheck(loginUserInfoVO.getPhone());
-                if (r2.getCode() == Constants.SUCCESS){
-                    loginUserInfoVO.setPropertyId((Long)r2.getData());
                 }
             }
             return new UsernamePasswordAuthenticationToken(loginUserInfoVO, password, grantedAuthorityList);

--
Gitblit v1.7.1