From 0440975fd60b48601ed5fda7953d9a5eed14ee75 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 29 五月 2024 13:44:55 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java
index f6cad3e..6e6eb2d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoSv.java
@@ -28,6 +28,7 @@
this.baPrivilegeMapper = baPrivilegeMapper ;
}
+
/**
* 闇�瑕丅aUserMapper.xml
* @param uuid 缁欑櫥褰曟垚鍔熺殑鐢ㄦ埛璧嬪�煎叾token
@@ -40,8 +41,8 @@
@Cacheable(cacheNames=CacheConstants.cacheNames, key="'" + CacheConstants.loginUserKeyPrefix + "' + #uuid", sync=true)
public BaUser loginWithMapperXml(String uuid, String phone, String password){
BaUser baUser = this.baUserMapper.login(phone, password) ;
- if(baUser != null && baUser.id != null){
- baUser.privileges = this.baPrivilegeMapper.selectPrivilegeByUserId(baUser.id) ;
+ if(baUser != null && baUser.userId != null){
+ baUser.privileges = this.baPrivilegeMapper.selectPrivilegeByUserId(baUser.userId) ;
}
return baUser;
}
@@ -65,8 +66,8 @@
.eq("phone", phone)
.eq("password", password);
BaUser baUser = this.baUserMapper.selectOne(qw) ;
- if(baUser != null && baUser.id != null){
- baUser.privileges = this.baPrivilegeMapper.selectPrivilegeByUserId(baUser.id) ;
+ if(baUser != null && baUser.userId != null){
+ baUser.privileges = this.baPrivilegeMapper.selectPrivilegeByUserId(baUser.userId) ;
}
return baUser;
}
@@ -77,7 +78,7 @@
@Cacheable(cacheNames=CacheConstants.cacheNames, key="'" + CacheConstants.loginUserKeyPrefix + "' + #uuid")
public BaUser getByUuid(String uuid){
- //姝ゆ柟娉曠洰鐨勬槸鐩存帴浠庣紦瀛樹腑璇诲彇锛屽鏋滅紦瀛樻棤姝ゅ�硷紝璇存槑鏁版嵁琚竻妤氫簡锛岃繑鍥瀗ull鍊硷紝闇�瑕侀噸鏂扮櫥褰�
+ //姝ゆ柟娉曠洰鐨勬槸鐩存帴浠庣紦瀛樹腑璇诲彇锛屽鏋滅紦瀛樻棤姝ゅ�硷紝璇存槑鏁版嵁琚竻闄や簡锛岃繑鍥瀗ull鍊硷紝闇�瑕侀噸鏂扮櫥褰�
return null ;
}
--
Gitblit v1.8.0