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 projects = projectMapper.selectList(Wrappers.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 projects = projectMapper.selectList(Wrappers.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 licenses = licenseMapper.selectList(Wrappers.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 licenses = licenseMapper.selectList(Wrappers.lambdaQuery().eq(LicenseDO::getProjectId, projectDO.getId())); - if (CollUtil.isNotEmpty(licenses)) { - throw exception(PROJECT_EXISTS_LICENSE); - } + return projectDO; }