From be83d79e304993bdff31b16ab8c6d2783be73521 Mon Sep 17 00:00:00 2001
From: caiyuchao <caiyuchao@agrandtech.com>
Date: Thu, 9 Oct 2025 18:33:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../license/service/customer/CustomerServiceImpl.java | 11 +++++++----
 .../license/service/project/ProjectServiceImpl.java   | 10 ++++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/customer/CustomerServiceImpl.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/customer/CustomerServiceImpl.java
index 522f317..166e3a4 100644
--- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/customer/CustomerServiceImpl.java
+++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/customer/CustomerServiceImpl.java
@@ -141,6 +141,12 @@ public class CustomerServiceImpl implements CustomerService {
     public void deleteCustomer(Long id) {
         // 校验存在
         CustomerDO customerDO = validateCustomerExists(id);
+
+        List<ProjectDO> projects = projectMapper.selectList(Wrappers.<ProjectDO>lambdaQuery().eq(ProjectDO::getCustomerId, id));
+        if (CollUtil.isNotEmpty(projects)) {
+            throw exception(CUSTOMER_EXISTS_PROJECT);
+        }
+
         // 删除
         customerMapper.deleteById(id);
 
@@ -152,10 +158,7 @@ public class CustomerServiceImpl implements CustomerService {
         if (customerDO == null) {
             throw exception(CUSTOMER_NOT_EXISTS);
         }
-        List<ProjectDO> projects = projectMapper.selectList(Wrappers.<ProjectDO>lambdaQuery().eq(ProjectDO::getCustomerId, id));
-        if (CollUtil.isNotEmpty(projects)) {
-            throw exception(CUSTOMER_EXISTS_PROJECT);
-        }
+
         return customerDO;
     }
 
diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/project/ProjectServiceImpl.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/project/ProjectServiceImpl.java
index 8b9bb2b..f72bbb0 100644
--- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/project/ProjectServiceImpl.java
+++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/service/project/ProjectServiceImpl.java
@@ -115,6 +115,11 @@ public class ProjectServiceImpl implements ProjectService {
     public void deleteProject(Long id) {
         // 校验存在
         ProjectDO project = validateProjectExists(id);
+
+        List<LicenseDO> licenses = licenseMapper.selectList(Wrappers.<LicenseDO>lambdaQuery().eq(LicenseDO::getProjectId, project.getId()));
+        if (CollUtil.isNotEmpty(licenses)) {
+            throw exception(PROJECT_EXISTS_LICENSE);
+        }
         // 删除
         projectMapper.deleteById(id);
         LogRecordContext.putVariable("project", project);
@@ -125,10 +130,7 @@ public class ProjectServiceImpl implements ProjectService {
         if (projectDO == null) {
             throw exception(PROJECT_NOT_EXISTS);
         }
-        List<LicenseDO> licenses = licenseMapper.selectList(Wrappers.<LicenseDO>lambdaQuery().eq(LicenseDO::getProjectId, projectDO.getId()));
-        if (CollUtil.isNotEmpty(licenses)) {
-            throw exception(PROJECT_EXISTS_LICENSE);
-        }
+
         return projectDO;
     }