From b2f262628a1dd03ca82f42f0177a80b2cb56f4d6 Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Mon, 4 Nov 2024 18:04:20 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E7=94=A8=E4=BE=8B=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E8=AF=84=E5=AE=A1=E9=AB=98=E7=BA=A7=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../functional/mapper/ExtCaseReviewMapper.xml | 27 ++++++++++++-------
 .../controller/CaseReviewControllerTests.java |  7 ++++-
 2 files changed, 24 insertions(+), 10 deletions(-)

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 @@
         <include refid="filters">
             <property name="filter" value="request.condition.filter"/>
         </include>
-        <if test="request.condition.combine != null">
+        <if test="request.condition.combineSearch != null">
             <include refid="combine">
                 <property name="combineSearch" value="request.condition.combineSearch"/>
             </include>
@@ -195,24 +195,30 @@
                                 <property name="column" value="case_review.create_user"/>
                             </include>
                         </if>
-                        <if test="condition.name == 'reviewers'">
+                        <if test="condition.name == 'follower'">
                             <include refid="io.metersphere.system.mapper.BaseMapper.associationCondition">
                                 <property name="mainIdColumn" value="case_review.id"/>
-                                <property name="associationTable" value="case_review_functional_case_user"/>
+                                <property name="associationTable" value="case_review_follower"/>
                                 <property name="associationIdColumn" value="review_id"/>
                                 <property name="searchColumn" value="user_id"/>
                                 <property name="condition" value="condition"/>
                             </include>
                         </if>
-                        <include refid="io.metersphere.system.mapper.BaseMapper.queryType">
-                            <property name="searchMode" value="${combineSearch}.searchMode"/>
-                        </include>
                     </foreach>
                     <foreach collection="${combineSearch}.systemFieldConditions" item="condition">
                         <include refid="io.metersphere.system.mapper.BaseMapper.commonSystemFieldConditions">
                             <property name="condition" value="condition"/>
                             <property name="tablePrefix" value="case_review"/>
                         </include>
+                        <if test="condition.name == 'reviewers'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.associationCondition">
+                                <property name="mainIdColumn" value="case_review.id"/>
+                                <property name="associationTable" value="case_review_user"/>
+                                <property name="associationIdColumn" value="review_id"/>
+                                <property name="searchColumn" value="user_id"/>
+                                <property name="condition" value="condition"/>
+                            </include>
+                        </if>
                         <if test="condition.name == 'status'">
                             <include refid="io.metersphere.system.mapper.BaseMapper.condition">
                                 <property name="condition" value="condition"/>
@@ -249,9 +255,12 @@
                                 <property name="column" value="case_review.pass_rate"/>
                             </include>
                         </if>
-                        <include refid="io.metersphere.system.mapper.BaseMapper.queryType">
-                            <property name="searchMode" value="${combineSearch}.searchMode"/>
-                        </include>
+                        <if test="condition.name == 'description'">
+                            <include refid="io.metersphere.system.mapper.BaseMapper.condition">
+                                <property name="condition" value="condition"/>
+                                <property name="column" value="case_review.description"/>
+                            </include>
+                        </if>
                     </foreach>
                 </if>
             </trim>
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<String, List<String>> 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");