diff --git a/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugMapper.xml b/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugMapper.xml index 28f06428ff..ae30d94a04 100644 --- a/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugMapper.xml +++ b/backend/services/bug-management/src/main/java/io/metersphere/bug/mapper/ExtBugMapper.xml @@ -192,15 +192,13 @@ diff --git a/backend/services/bug-management/src/main/java/io/metersphere/bug/provider/AssociateBugProvider.java b/backend/services/bug-management/src/main/java/io/metersphere/bug/provider/AssociateBugProvider.java index 272dce40a5..4d848b988b 100644 --- a/backend/services/bug-management/src/main/java/io/metersphere/bug/provider/AssociateBugProvider.java +++ b/backend/services/bug-management/src/main/java/io/metersphere/bug/provider/AssociateBugProvider.java @@ -75,7 +75,7 @@ public class AssociateBugProvider implements BaseAssociateBugProvider { @Override public List hasAssociateBugPage(AssociateBugPageRequest request) { - return extBugRelateCaseMapper.getAssociateBugs(request); + return extBugRelateCaseMapper.getAssociateBugs(request, request.getSortString()); //TODO 需要转义状态和处理人属性 } } diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/controller/FunctionalCaseRelationshipController.java b/backend/services/case-management/src/main/java/io/metersphere/functional/controller/FunctionalCaseRelationshipController.java index b2e528324d..f5dcc785e6 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/controller/FunctionalCaseRelationshipController.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/controller/FunctionalCaseRelationshipController.java @@ -39,7 +39,7 @@ public class FunctionalCaseRelationshipController { private FunctionalCaseRelationshipEdgeService functionalCaseRelationshipEdgeService; @GetMapping("/get-ids/{caseId}") - @Operation(summary = "用例管理-功能用例-评审列表-评审详情-获取已关联用例id集合(关联用例弹窗前调用)") + @Operation(summary = "用例管理-功能用例-用例详情-前后置关系-获取已关联用例id集合(关联用例弹窗前调用)") @CheckOwner(resourceId = "#reviewId", resourceType = "case_review") public List getCaseIds(@PathVariable String caseId) { return functionalCaseRelationshipEdgeService.getExcludeIds(caseId); diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/controller/FunctionalTestCaseController.java b/backend/services/case-management/src/main/java/io/metersphere/functional/controller/FunctionalTestCaseController.java index 13a941b9c6..29767983fa 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/controller/FunctionalTestCaseController.java +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/controller/FunctionalTestCaseController.java @@ -126,8 +126,7 @@ public class FunctionalTestCaseController { @RequiresPermissions(value = {PermissionConstants.FUNCTIONAL_CASE_READ_ADD, PermissionConstants.FUNCTIONAL_CASE_READ_UPDATE, PermissionConstants.FUNCTIONAL_CASE_READ_DELETE}, logical = Logical.OR) @CheckOwner(resourceId = "#request.getProjectId()", resourceType = "project") public Pager> getAssociateBugList(@Validated @RequestBody AssociateBugPageRequest request) { - Page page = PageHelper.startPage(request.getCurrent(), request.getPageSize(), - StringUtils.isNotBlank(request.getSortString()) ? request.getSortString() : "create_time desc"); + Page page = PageHelper.startPage(request.getCurrent(), request.getPageSize()); return PageUtils.setPageInfo(page, functionalTestCaseService.hasAssociateBugPage(request)); } } diff --git a/backend/services/case-management/src/test/java/io/metersphere/functional/controller/CaseReviewFunctionalCaseControllerTests.java b/backend/services/case-management/src/test/java/io/metersphere/functional/controller/CaseReviewFunctionalCaseControllerTests.java index 5f2748e096..dd3fccf6c1 100644 --- a/backend/services/case-management/src/test/java/io/metersphere/functional/controller/CaseReviewFunctionalCaseControllerTests.java +++ b/backend/services/case-management/src/test/java/io/metersphere/functional/controller/CaseReviewFunctionalCaseControllerTests.java @@ -105,9 +105,12 @@ public class CaseReviewFunctionalCaseControllerTests extends BaseTest { put("type", "List"); }})); request.setCombine(map); - request.setViewFlag(false); + request.setViewFlag(true); request.setProjectId("wx_test_project"); this.requestPostWithOkAndReturn(REVIEW_CASE_PAGE, request); + this.requestPostWithOkAndReturn(REVIEW_FUNCTIONAL_CASE_MODULE_COUNT, request); + request.setViewFlag(false); + this.requestPostWithOkAndReturn(REVIEW_CASE_PAGE, request); request.setSort(new HashMap<>() {{ put("createTime", "desc");