From 5b5daef2e06d37c3cfc3d2ebe8f61060a6ca1ded Mon Sep 17 00:00:00 2001
From: caiyuchao <caiyuchao@agrandtech.com>
Date: Fri, 5 Sep 2025 15:44:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20license=E5=AF=BC=E5=85=A5=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E4=B8=8D=E5=8C=BA=E5=88=86sn=E5=92=8C=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=90=8D=E7=A7=B0=E9=87=8D=E5=A4=8D=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dal/mysql/project/ProjectMapper.java        |  3 ++-
 .../service/license/LicenseServiceImpl.java     | 17 +++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/mysql/project/ProjectMapper.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/mysql/project/ProjectMapper.java
index 7c7378b..9f281e6 100644
--- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/mysql/project/ProjectMapper.java
+++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/dal/mysql/project/ProjectMapper.java
@@ -2,6 +2,7 @@ package org.agt.module.license.dal.mysql.project;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.agt.framework.common.pojo.PageResult;
 import org.agt.framework.mybatis.core.mapper.BaseMapperX;
 import org.agt.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -71,7 +72,7 @@ public interface ProjectMapper extends BaseMapperX<ProjectDO> {
     }
 
     default ProjectDO selectByName(String name) {
-        return selectOne(ProjectDO::getName, name);
+        return selectOne(Wrappers.<ProjectDO>lambdaQuery().eq(ProjectDO::getName, name), false);
     }
 
     default ProjectDO selectByCode(String code) {
diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseServiceImpl.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseServiceImpl.java
index 91cb116..5a573cc 100644
--- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseServiceImpl.java
+++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseServiceImpl.java
@@ -694,6 +694,8 @@ public class LicenseServiceImpl implements LicenseService {
                 respVO.getFailures().put(serialNo, "客户名称不能为空");
                 continue;
             }
+            importVO.setCustomerName(importVO.getCustomerName().trim());
+            importVO.setProjectName(importVO.getProjectName().trim());
             LocalDateTime createTime = getCreateTime(importVO);
             CustomerDO customerDO = customerMapper.selectOne(Wrappers.<CustomerDO>lambdaQuery().eq(CustomerDO::getName, importVO.getCustomerName()), false);
             if (customerDO == null) {
@@ -710,7 +712,7 @@ public class LicenseServiceImpl implements LicenseService {
             }
             Long customerId = customerDO.getId();
 
-            ProjectDO projectDO = projectMapper.getBySnAndProjectAndCustomer(serialNo, importVO.getProjectName(), importVO.getCustomerName());
+            ProjectDO projectDO = projectMapper.getBySnAndProjectAndCustomer(null, importVO.getProjectName(), importVO.getCustomerName());
             Long projectId = null;
 
             if (projectDO == null) {
@@ -749,12 +751,15 @@ public class LicenseServiceImpl implements LicenseService {
 //            licenseDO.setApplicant(WebFrameworkUtils.getLoginUserId());
             String expiryDateExt = importVO.getExpiryDateExt();
             LocalDateTime expiryDate;
-            if ("永久".equals(expiryDateExt)) {
-                expiryDate = LocalDateTime.of(2099, 12, 31, 23, 59, 59);
-            } else {
-                expiryDate = LocalDateTime.of(LocalDate.parse(expiryDateExt, DateTimeFormatter.ofPattern("yyyy/M/d")), LocalTime.of(23, 59, 59));
+            if (StrUtil.isNotBlank(expiryDateExt)) {
+                if ("永久".equals(expiryDateExt)) {
+                    expiryDate = LocalDateTime.of(2099, 12, 31, 23, 59, 59);
+                } else {
+                    expiryDate = LocalDateTime.of(LocalDate.parse(expiryDateExt, DateTimeFormatter.ofPattern("yyyy/M/d")), LocalTime.of(23, 59, 59));
+                }
+                licenseDO.setExpiryDate(expiryDate);
             }
-            licenseDO.setExpiryDate(expiryDate);
+
             licenseDO.setApplicationTime(createTime);
 //            licenseDO.setUserNumber(importVO.getUserNumber());
 //            licenseDO.setRanNumber(importVO.getRanNumber());