From e3317793fea34179afca5c6088f3f4e2396bb483 Mon Sep 17 00:00:00 2001
From: lq1405 <2769838458@qq.com>
Date: Fri, 27 Dec 2024 22:26:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E8=BD=AF=E4=BB=B6?=
=?UTF-8?q?=E7=99=BB=E5=BD=95=20=E5=88=B0=E6=9C=9F=E6=97=B6=E9=97=B4?=
=?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6=20=E6=A0=A1=E9=AA=8C=E6=9C=AA?=
=?UTF-8?q?=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
LMS.service/LMS.service.csproj | 2 +-
LMS.service/Service/UserService/LoginService.cs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/LMS.service/LMS.service.csproj b/LMS.service/LMS.service.csproj
index 8dc7350..d71f536 100644
--- a/LMS.service/LMS.service.csproj
+++ b/LMS.service/LMS.service.csproj
@@ -7,7 +7,7 @@
ed64fb6f-9c93-43d0-b418-61f507f28420
Linux
.
- 1.0.2
+ 1.0.3
diff --git a/LMS.service/Service/UserService/LoginService.cs b/LMS.service/Service/UserService/LoginService.cs
index 4443374..09bf9b6 100644
--- a/LMS.service/Service/UserService/LoginService.cs
+++ b/LMS.service/Service/UserService/LoginService.cs
@@ -353,7 +353,7 @@ namespace LMS.service.Service.UserService
return APIResponseModel.CreateErrorResponseModel(ResponseCode.NotPermissionAction, "当前用户没有软件控制权限，请联系管理员");
}
// 不是永久，需要判断是不是到期
- if (softwareControl.IsForever == false && softwareControl.ExpirationTime <= BeijingTimeExtension.GetBeijingTime())
+ if (softwareControl.IsForever == false && (softwareControl.ExpirationTime == null || softwareControl.ExpirationTime <= BeijingTimeExtension.GetBeijingTime()))
{
return APIResponseModel.CreateErrorResponseModel(ResponseCode.NotPermissionAction, "当前用户的软件权限已到期，请联系管理员");
}