From bf773f62438c5aa22bb7b89363d91815084efcd5 Mon Sep 17 00:00:00 2001
From: caiyuchao <caiyuchao@agrandtech.com>
Date: Fri, 12 Sep 2025 09:44:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20license=E7=AE=A1=E7=90=86=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=90=8D=E7=A7=B0=E6=90=9C=E7=B4=A2=E5=92=8C=E6=8F=90?=
 =?UTF-8?q?=E9=86=92=E6=B7=BB=E5=8A=A0url=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../license/controller/admin/license/vo/LicensePageReqVO.java  | 3 +++
 .../org/agt/module/license/service/license/LicenseTask.java    | 1 +
 .../src/main/resources/mapper/license/LicenseMapper.xml        | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicensePageReqVO.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicensePageReqVO.java
index 826284e..fb6a1b8 100644
--- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicensePageReqVO.java
+++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/license/vo/LicensePageReqVO.java
@@ -24,6 +24,9 @@ public class LicensePageReqVO extends PageParam {
     @Schema(description = "项目ID", example = "2496")
     private Long projectId;
 
+    @Schema(description = "项目名称", example = "2496")
+    private String projectName;
+
     @Schema(description = "sn")
     private String serialNo;
 
diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseTask.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseTask.java
index 9fc77c2..d137abb 100644
--- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseTask.java
+++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/license/LicenseTask.java
@@ -110,6 +110,7 @@ public class LicenseTask {
                             Map<String, Object> templateParams = new HashMap<>();
                             templateParams.put("sn", licenseDO.getSerialNo());
                             templateParams.put("days", day);
+                            templateParams.put("url", "http://192.168.9.50#/license");
 
                             try {
                                 templateParams.put("expiryDate", licenseDO.getExpiryDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
diff --git a/agt-module-license/agt-module-license-server/src/main/resources/mapper/license/LicenseMapper.xml b/agt-module-license/agt-module-license-server/src/main/resources/mapper/license/LicenseMapper.xml
index 16b1f4b..9fc1d87 100644
--- a/agt-module-license/agt-module-license-server/src/main/resources/mapper/license/LicenseMapper.xml
+++ b/agt-module-license/agt-module-license-server/src/main/resources/mapper/license/LicenseMapper.xml
@@ -92,6 +92,9 @@
         <if test="query.createTime != null and query.createTime.length > 1">
             AND l.create_time BETWEEN #{query.createTime[0]} AND #{query.createTime[1]}
         </if>
+        <if test="query.projectName != null and query.projectName != ''">
+            AND p.name LIKE CONCAT('%',#{query.projectName},'%')
+        </if>
         ORDER BY
         	l.application_time DESC
     </select>