From bbe9826b889664d124e2fac69b5b900ad97f8351 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 30 五月 2024 09:16:17 +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 | 8 ++++----
1 files changed, 4 insertions(+), 4 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 6e6eb2d..52c1c6a 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
@@ -41,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.userId != null){
- baUser.privileges = this.baPrivilegeMapper.selectPrivilegeByUserId(baUser.userId) ;
+ if(baUser != null && baUser.id != null){
+ baUser.privileges = this.baPrivilegeMapper.selectPrivilegeByUserId(baUser.id) ;
}
return baUser;
}
@@ -66,8 +66,8 @@
.eq("phone", phone)
.eq("password", password);
BaUser baUser = this.baUserMapper.selectOne(qw) ;
- if(baUser != null && baUser.userId != null){
- baUser.privileges = this.baPrivilegeMapper.selectPrivilegeByUserId(baUser.userId) ;
+ if(baUser != null && baUser.id != null){
+ baUser.privileges = this.baPrivilegeMapper.selectPrivilegeByUserId(baUser.id) ;
}
return baUser;
}
--
Gitblit v1.8.0