From 3e49ff6a3db6710bc327d99384d4b8fc6d474da4 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 27 六月 2024 13:44: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/SsoCtrl.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/SsoCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
index 725177d..e2ab54b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
@@ -229,7 +229,7 @@
@GetMapping(path = "loginUserId")
public Long loginUserId(String token){
BaUser userPo = this.sv.getByUuid(token) ;
- return userPo == null ? null : userPo.userId ;
+ return userPo == null ? null : userPo.id ;
}
/**
* 姝ゆ柟娉曚緵瀛愭ā鍧楃郴缁熻皟鐢紝鎵�浠ヤ笉鍏紑鍦ˋPI鎺ュ彛涓�
@@ -245,10 +245,10 @@
if(userPo != null){
vo.dataSourceName = userPo.orgTag ;
vo.logined = true ;
- vo.hasPower = true ;//榛樿鏈夋潈闄�
+ vo.hasPower = true ;//榛樿鏈夋潈闄愩��2023-12-21 缁忓晢璁紝鐢卞墠绔壌鏉�
}else{
vo.logined = false ;
- vo.hasPower = true ;//榛樿鏈夋潈闄�
+ vo.hasPower = true ;//榛樿鏈夋潈闄愩��2023-12-21 缁忓晢璁紝鐢卞墠绔壌鏉�
}
return vo ;
}
@@ -306,7 +306,7 @@
BaUser userPo = this.sv.getByUuid(token) ;
CurUserVo vo = new CurUserVo();
if(userPo != null){
- vo.id = userPo.userId ;
+ vo.id = userPo.id ;
vo.name = userPo.userName;
}
return vo ;
--
Gitblit v1.8.0