From 7e8c0121e1502f645a8388295cb3a2b5d99a6cb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Tue, 10 Dec 2024 16:19:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=BF=94=E5=9B=9E=E5=BA=97?= =?UTF-8?q?=E9=93=BA=E6=8E=88=E6=9D=83=E8=BF=87=E6=9C=9F=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashier/config/security/rest/AuthorizationController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/AuthorizationController.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/AuthorizationController.java index 89385aa8..8a7e1f2a 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/AuthorizationController.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/security/rest/AuthorizationController.java @@ -166,7 +166,7 @@ public class AuthorizationController { authInfo.put("expireDate", null); if (tbPlussShopStaff != null) { TbShopInfo shopInfo = shopInfoMapper.selectById(tbPlussShopStaff.getShopId()); - if (shopInfo != null) { + if (shopInfo != null && shopInfo.getExpireAt() != null) { Long expireAt = shopInfo.getExpireAt(); Date time = DateUtil.calendar(expireAt).getTime(); authInfo.put("expireDate", DateUtil.formatDate(time)); @@ -245,7 +245,7 @@ public class AuthorizationController { authInfo.put("expireDate", null); if (byAccount != null) { TbShopInfo shopInfo = shopInfoMapper.selectById(byAccount.getId()); - if (shopInfo != null) { + if (shopInfo != null && shopInfo.getExpireAt() != null) { Long expireAt = shopInfo.getExpireAt(); Date time = DateUtil.calendar(expireAt).getTime(); authInfo.put("expireDate", DateUtil.formatDate(time));