From 906328ba3f842f5f86cb5bd60e09a8a7f6d2ac93 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 13 十月 2023 08:32:18 +0800
Subject: [PATCH] zjh 2023/10/12--2
---
ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java | 33 +++++++++++++++++----------------
1 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java b/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
index 171dd14..355c5b8 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
@@ -140,25 +140,26 @@
Long userId =loginUser.getUser().getUserId();
SysUser user = userService.getById(userId);
if(null !=user && null !=user.getDeptId()){
-// loginUser.getUser().setOrgId(user.getOrgId());
- if(!SecurityUtils.isAdmin(user.getUserId())){
SysDept sysDept = deptService.getById(user.getDeptId());
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(),
- dictHosp.getExpirationTime(),dictHosp.getSecretKey())) {
- throw new SecretKeyException("鍟嗗宸茶繃鏈熻缁垂浣跨敤");
- }
- long between = DateUtil.between(new Date(), DateUtil.endOfDay(dictHosp.getExpirationTime()), DateUnit.DAY);
- if(between<=30){
- loginUser.setMessage("杩樻湁 "+between+" 澶╁埌鏈� 璇锋敞鎰忕画璐�! 浠ュ厤褰卞搷姝ｅ父浣跨敤!");
- }else {
- loginUser.setMessage(null);
- }
-
- }else {
- throw new SecretKeyException("璇风即璐逛娇鐢�");
+ if(null !=dictHosp){
+ loginUser.setHospName(dictHosp.getHospAreaName());
+ if(!SecurityUtils.isAdmin(user.getUserId())){
+ if(dictHosp.getSecretKey() != null && dictHosp.getExpirationTime() != null){
+ if (!SecurityUtils.matchesMallMerchantSecretKey(secret,dictHosp.getHospAreaId(),dictHosp.getAreaid(),
+ dictHosp.getExpirationTime(),dictHosp.getSecretKey())) {
+ throw new SecretKeyException("鍟嗗宸茶繃鏈熻缁垂浣跨敤");
+ }
+ long between = DateUtil.between(new Date(), DateUtil.endOfDay(dictHosp.getExpirationTime()), DateUnit.DAY);
+ if(between<=30){
+ loginUser.setMessage("杩樻湁 "+between+" 澶╁埌鏈� 璇锋敞鎰忕画璐�! 浠ュ厤褰卞搷姝ｅ父浣跨敤!");
+ }else {
+ loginUser.setMessage(null);
+ }
+ }else {
+ throw new SecretKeyException("璇风即璐逛娇鐢�");
+ }
}
}
}
--
Gitblit v1.8.0