diff --git a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/customer/CustomerController.java b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/customer/CustomerController.java index aeca5e6..accd393 100644 --- a/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/customer/CustomerController.java +++ b/agt-module-license/agt-module-license-server/src/main/java/org/agt/module/license/controller/admin/customer/CustomerController.java @@ -147,7 +147,7 @@ public class CustomerController { @GetMapping("/list") @Operation(summary = "获得客户列表") - @PreAuthorize("@ss.hasPermission('license:customer:query')") +// @PreAuthorize("@ss.hasPermission('license:customer:query')") public CommonResult> getCustomerList() { List listResult = customerService.getCustomerList(); 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 f3cc4a4..b079df7 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 @@ -9,7 +9,6 @@ import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.agt.framework.common.pojo.PageResult; import org.agt.framework.common.util.object.BeanUtils; -import org.agt.module.license.controller.admin.comment.vo.CommentTreeRespVO; import org.agt.module.license.controller.admin.license.vo.ImportRespVO; import org.agt.module.license.controller.admin.project.vo.ProjectImportRespVO; import org.agt.module.license.controller.admin.project.vo.ProjectListReqVO; @@ -17,8 +16,6 @@ import org.agt.module.license.controller.admin.project.vo.ProjectPageReqVO; import org.agt.module.license.controller.admin.project.vo.ProjectRespVO; import org.agt.module.license.controller.admin.project.vo.ProjectSaveReqVO; import org.agt.module.license.dal.dataobject.customer.CustomerDO; -import org.agt.module.license.dal.dataobject.license.LicenseDO; -import org.agt.module.license.dal.dataobject.license.LicenseHistoryDO; import org.agt.module.license.dal.dataobject.project.ProjectDO; import org.agt.module.license.dal.mysql.comment.CommentMapper; import org.agt.module.license.dal.mysql.customer.CustomerMapper; @@ -31,7 +28,6 @@ import org.springframework.validation.annotation.Validated; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; -import java.util.Optional; import static org.agt.framework.common.exception.util.ServiceExceptionUtil.exception; import static org.agt.module.license.enums.ErrorCodeConstants.PROJECT_CODE_DUPLICATE; @@ -123,21 +119,6 @@ public class ProjectServiceImpl implements ProjectService { } IPage page = projectMapper.queryPage(new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()), pageReqVO); - for (ProjectRespVO record : page.getRecords()) { - List comments = commentMapper.getCommentList(record.getId()); - record.setCommentNum(comments.size()); - - List licenseList = licenseMapper.selectList(Wrappers.lambdaQuery().eq(LicenseDO::getProjectId, record.getId())); - Optional licenseOptional = licenseList.stream().findFirst(); - int applyCount = 0; - if (licenseOptional.isPresent()) { - List historyList = licenseHistoryMapper.selectList(Wrappers.lambdaQuery() - .eq(LicenseHistoryDO::getLicenseId, licenseOptional.get().getId())); - applyCount = 1 + historyList.size(); - } - record.setApplyCount(applyCount); - - } return new PageResult<>(page.getRecords(), page.getTotal()); } diff --git a/agt-module-license/agt-module-license-server/src/main/resources/mapper/project/ProjectMapper.xml b/agt-module-license/agt-module-license-server/src/main/resources/mapper/project/ProjectMapper.xml index 0d3ad54..114d97e 100644 --- a/agt-module-license/agt-module-license-server/src/main/resources/mapper/project/ProjectMapper.xml +++ b/agt-module-license/agt-module-license-server/src/main/resources/mapper/project/ProjectMapper.xml @@ -90,7 +90,7 @@ LEFT JOIN ( SELECT l.project_id, - count( lh.id ) + 1 apply_count + count( lh.id ) + count(l.serial_no) apply_count FROM crm_license_server l LEFT JOIN crm_license_server_history lh ON l.id = lh.license_id