diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewMapper.xml b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewMapper.xml index 88229c83e7..6660d01c33 100644 --- a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewMapper.xml +++ b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewMapper.xml @@ -79,7 +79,7 @@ - + @@ -195,24 +195,30 @@ - + - + - - - + + + + + + + + + @@ -249,9 +255,12 @@ - - - + + + + + + diff --git a/backend/services/case-management/src/test/java/io/metersphere/functional/controller/CaseReviewControllerTests.java b/backend/services/case-management/src/test/java/io/metersphere/functional/controller/CaseReviewControllerTests.java index 18697ff493..e477ed9467 100644 --- a/backend/services/case-management/src/test/java/io/metersphere/functional/controller/CaseReviewControllerTests.java +++ b/backend/services/case-management/src/test/java/io/metersphere/functional/controller/CaseReviewControllerTests.java @@ -8,6 +8,7 @@ import io.metersphere.functional.mapper.*; import io.metersphere.functional.request.*; import io.metersphere.functional.result.CaseManagementResultCode; import io.metersphere.sdk.constants.SessionConstants; +import io.metersphere.sdk.dto.CombineSearch; import io.metersphere.sdk.util.JSON; import io.metersphere.system.base.BaseTest; import io.metersphere.system.controller.handler.ResultHolder; @@ -408,7 +409,11 @@ public class CaseReviewControllerTests extends BaseTest { Map> filters = new HashMap<>(); filters.put("status", Arrays.asList("PREPARED", "UNDERWAY", "COMPLETED", "ARCHIVED")); request.setFilter(filters); - request.setCombine(caseReviewCombine); + CombineSearch combineSearch = new CombineSearch(); + combineSearch.setSearchMode("AND"); + combineSearch.setConditions(new ArrayList<>()); + request.setCombineSearch(combineSearch); + request.setViewId("my_follow"); request.setProjectId(projectId); request.setKeyword("评审更新"); request.setReviewByMe("admin");