From 8e925f5deae670edf6c62fe6e13ade401cadb564 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 10 十一月 2022 18:08:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
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