From 67aab76b35f0ddb5c8b71313b81fa8867770a763 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 26 六月 2024 21:08:05 +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 | 21 +++------------------
1 files changed, 3 insertions(+), 18 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 e1ddefe..9dd39b3 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
@@ -1,7 +1,6 @@
package com.dy.sso.busi;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.dy.pipIrrGlobal.daoBa.BaPrivilegeMapper;
import com.dy.pipIrrGlobal.daoBa.BaUserMapper;
import com.dy.pipIrrGlobal.pojoBa.BaUser;
import lombok.extern.slf4j.Slf4j;
@@ -16,16 +15,10 @@
public class SsoSv {
private BaUserMapper baUserMapper;
- private BaPrivilegeMapper baPrivilegeMapper;
@Autowired
private void setBaUserMapper(BaUserMapper baUserMapper){
this.baUserMapper = baUserMapper ;
- }
-
- @Autowired
- private void setBaPrivilegeMapper(BaPrivilegeMapper baPrivilegeMapper){
- this.baPrivilegeMapper = baPrivilegeMapper ;
}
@@ -40,11 +33,7 @@
@Transactional
@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) ;
- }
- return baUser;
+ return this.baUserMapper.login(phone, password) ;
}
/**
@@ -65,11 +54,7 @@
.eq("deleted", 0)
.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) ;
- }
- return baUser;
+ return this.baUserMapper.selectOne(qw) ;
}
@CacheEvict(cacheNames=CacheConstants.cacheNames, key="'" + CacheConstants.loginUserKeyPrefix + "' + #uuid")
@@ -78,7 +63,7 @@
@Cacheable(cacheNames=CacheConstants.cacheNames, key="'" + CacheConstants.loginUserKeyPrefix + "' + #uuid")
public BaUser getByUuid(String uuid){
- //姝ゆ柟娉曠洰鐨勬槸鐩存帴浠庣紦瀛樹腑璇诲彇锛屽鏋滅紦瀛樻棤姝ゅ�硷紝璇存槑鏁版嵁琚竻妤氫簡锛岃繑鍥瀗ull鍊硷紝闇�瑕侀噸鏂扮櫥褰�
+ //姝ゆ柟娉曠洰鐨勬槸鐩存帴浠庣紦瀛樹腑璇诲彇锛屽鏋滅紦瀛樻棤姝ゅ�硷紝璇存槑鏁版嵁琚竻闄や簡锛岃繑鍥瀗ull鍊硷紝闇�瑕侀噸鏂扮櫥褰�
return null ;
}
--
Gitblit v1.8.0