From dc8008be8836c212f17fa29df7eac52a8fe716c4 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 03 七月 2024 15:46:21 +0800
Subject: [PATCH] 2024-07-03 朱宝民 小程序远程开阀支持扫码开阀
---
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java | 11 +++++------
1 files changed, 5 insertions(+), 6 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 07c5702..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
@@ -7,7 +7,6 @@
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.ResultCodeMsg;
import com.dy.pipIrrGlobal.pojoBa.BaUser;
-import com.dy.pipIrrGlobal.util.DistrictLevel;
import com.dy.pipIrrGlobal.util.Org;
import com.mysql.cj.util.StringUtils;
import io.swagger.v3.oas.annotations.Hidden;
@@ -22,15 +21,15 @@
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.cache.CacheManager;
import org.springframework.http.MediaType;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.UUID;
+
+//import org.springframework.cache.CacheManager;
/**
* 娉ㄨВTag 鍦ˋPI涓樉绀猴細 Tag 娉ㄨВ, 缁欐暣涓帴鍙ｈ捣浜嗕釜鍚嶅瓧涓庢弿杩�"
@@ -246,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 ;
}
@@ -308,7 +307,7 @@
CurUserVo vo = new CurUserVo();
if(userPo != null){
vo.id = userPo.id ;
- vo.name = userPo.name ;
+ vo.name = userPo.userName;
}
return vo ;
}
--
Gitblit v1.8.0