From 7ae43a47d067a897d9f5863e3773a30fc0136989 Mon Sep 17 00:00:00 2001
From: caiyuchao <caiyuchao@agrandtech.com>
Date: Mon, 21 Jul 2025 11:11:08 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=9B=E5=BB=BA=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7license?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/project/ProjectController.java       | 8 ++++----
 .../license/service/license/LicenseServiceImpl.java       | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/project/ProjectController.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/project/ProjectController.java
index 7143866..a212ba5 100644
--- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/project/ProjectController.java
+++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/project/ProjectController.java
@@ -34,6 +34,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Optional;
 
 import static org.agt.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static org.agt.framework.common.pojo.CommonResult.success;
@@ -91,10 +92,9 @@ public class ProjectController {
         PageResult<ProjectRespVO> pageResult = BeanUtils.toBean(doPageResult, ProjectRespVO.class);
         List<ProjectRespVO> projects = pageResult.getList();
         for (ProjectRespVO project : projects) {
-            LicenseDO licenseDO = licenseMapper.selectOne(LicenseDO::getProjectId, project.getId());
-            if (licenseDO != null) {
-                project.setSn(licenseDO.getSerialNo());
-            }
+            List<LicenseDO> licenseDOS = licenseMapper.selectList(LicenseDO::getProjectId, project.getId());
+            Optional<LicenseDO> first = licenseDOS.stream().findFirst();
+            first.ifPresent(licenseDO -> project.setSn(licenseDO.getSerialNo()));
         }
         return success(BeanUtils.toBean(pageResult, ProjectRespVO.class));
     }
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 7120fe9..accd10c 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
@@ -77,6 +77,9 @@ public class LicenseServiceImpl implements LicenseService {
         LicenseDO license = BeanUtils.toBean(createReqVO, LicenseDO.class);
         license.setStatus(LicenseStatusEnum.NOT_APPLIED.getCode());
         licenseMapper.insert(license);
+
+        createReqVO.setId(license.getId());
+        applyLicense(createReqVO);
         // 返回
         return license.getId();
     }