From bdbe40f077aa9ca2ec184707d3eab41af13def03 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 10 十一月 2022 18:12:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zigonggao_dev' into zigonggao_dev
---
springcloud_k8s_panzhihuazhihuishequ/auth/src/main/java/com/panzhihua/auth/handel/UserAuthenticationProvider.java | 6 +++++-
1 files changed, 5 insertions(+), 1 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 fdc1649..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);
}
@@ -142,7 +146,7 @@
//是否为专家登陆
if (nonNull(loginUserInfoVO.getPhone())){
R r1 = communityService.isExpert(loginUserInfoVO.getPhone());
- if (r1.getCode()== Constants.SUCCESS){
+ if (r1.getCode() == Constants.SUCCESS){
loginUserInfoVO.setType(13);
}
}
--
Gitblit v1.7.1