From e1f5df4f50ca620014d782595a38528a267d3929 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 02 九月 2024 20:08:09 +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 | 29 ++++++++++++-----------------
1 files changed, 12 insertions(+), 17 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..fbd0ceb 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;
@@ -11,22 +10,19 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.List;
+
@Slf4j
@Service
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 ;
- }
/**
* 闇�瑕丅aUserMapper.xml
@@ -39,11 +35,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) ;
}
/**
@@ -64,11 +56,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")
@@ -77,8 +65,15 @@
@Cacheable(cacheNames=CacheConstants.cacheNames, key="'" + CacheConstants.loginUserKeyPrefix + "' + #uuid")
public BaUser getByUuid(String uuid){
- //姝ゆ柟娉曠洰鐨勬槸鐩存帴浠庣紦瀛樹腑璇诲彇锛屽鏋滅紦瀛樻棤姝ゅ�硷紝璇存槑鏁版嵁琚竻妤氫簡锛岃繑鍥瀗ull鍊硷紝闇�瑕侀噸鏂扮櫥褰�
+ //姝ゆ柟娉曠洰鐨勬槸鐩存帴浠庣紦瀛樹腑璇诲彇锛屽鏋滅紦瀛樻棤姝ゅ�硷紝璇存槑鏁版嵁琚竻闄や簡锛岃繑鍥瀗ull鍊硷紝闇�瑕侀噸鏂扮櫥褰�
return null ;
}
+ /**
+ * 寰楀埌鎵�鏈夌敤鎴锋墜鏈哄彿
+ * @return
+ */
+ public List<String> getPhones(){
+ return baUserMapper.getPhones() ;
+ }
}
--
Gitblit v1.8.0