From 8c4968ea3bd61c154c71d40f43a2cc22760fef49 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 25 十月 2023 18:29:54 +0800
Subject: [PATCH] zjh 2023/10/25--1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
index 2686fc0..3982474 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysLoginController.java
@@ -111,10 +111,8 @@
@GetMapping("getInfo")
public AjaxResult getInfo() {
AjaxResult ajax = success();
-// SysUser user = Objects.requireNonNull(SecurityUtils.getLoginUser()).getUser();
SysUser user = UserHoder.getLoginUser().getUser();
if (null != user.getUserId()) {
- String message=null;
if (secretKeyLogin)
{
if(null !=user.getDeptId()){
@@ -123,7 +121,7 @@
if (null != sysDept) {
DictHosp dictHosp = hospService.getById(sysDept.getHospId());
if(null !=dictHosp && dictHosp.getSecretKey() !=null && dictHosp.getExpirationTime() !=null){
- if (!SecurityUtils.matchesMallMerchantSecretKey(secret,dictHosp.getHospAreaId(),dictHosp.getAreaid(),
+ if (!SecurityUtils.matchesMallMerchantSecretKey(secret,dictHosp.getHospAreaId(),dictHosp.getHospAreaName(),
dictHosp.getExpirationTime(),dictHosp.getSecretKey())) {
String userIdKey = Constants.LOGIN_USERID_KEY + user.getUserId();
@@ -133,12 +131,10 @@
redisCache.deleteObject(userIdKey);
redisCache.deleteObject(userKey);
}
-
throw new SecretKeyException("鍟嗗宸茶繃鏈熻缁垂浣跨敤");
}
long between = DateUtil.between(new Date(), DateUtil.endOfDay(dictHosp.getExpirationTime()), DateUnit.DAY);
if(between<=30){
-// message="杩樻湁 "+between+" 澶╁埌鏈� 璇锋敞鎰忕画璐�! 浠ュ厤褰卞搷姝ｅ父浣跨敤!";
UserHoder.getLoginUser().setMessage("杩樻湁 "+between+" 澶╁埌鏈� 璇锋敞鎰忕画璐�! 浠ュ厤褰卞搷姝ｅ父浣跨敤!");
}
}else {
@@ -155,6 +151,7 @@
ajax.put("roles", roles);
ajax.put("permissions", permissions);
ajax.put("securitMessage",UserHoder.getLoginUser().getMessage());
+ ajax.put("hospName",UserHoder.getLoginUser().getHospName());
} else {
Set<String> roles = new HashSet<>();
LambdaQueryWrapper<SysRole> wq = new LambdaQueryWrapper<>();
@@ -175,6 +172,7 @@
ajax.put("permissions", permissions);
ajax.put("post",null);
ajax.put("securitMessage",null);
+ ajax.put("hospName",UserHoder.getLoginUser().getHospName());
}
return ajax;
}
--
Gitblit v1.8.0