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 pageResult = BeanUtils.toBean(doPageResult, ProjectRespVO.class); List projects = pageResult.getList(); for (ProjectRespVO project : projects) { - LicenseDO licenseDO = licenseMapper.selectOne(LicenseDO::getProjectId, project.getId()); - if (licenseDO != null) { - project.setSn(licenseDO.getSerialNo()); - } + List licenseDOS = licenseMapper.selectList(LicenseDO::getProjectId, project.getId()); + Optional 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(); }