From 68afda90acc8e726e550ca6b3a0b92f4ce10f21d Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Fri, 12 Jul 2024 11:29:56 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E5=8A=9F=E8=83=BD=E7=94=A8=E4=BE=8B):?=
 =?UTF-8?q?=20=E7=94=A8=E4=BE=8B=E8=AF=84=E5=AE=A1=E8=84=91=E5=9B=BE?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AF=84=E5=AE=A1=E7=BB=93=E6=9E=9C=E8=80=83?=
 =?UTF-8?q?=E8=99=91=E5=A4=9A=E4=BA=BA=E8=AF=84=E5=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../functional/mapper/ExtFunctionalCaseMapper.xml      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml
index b6b3e2b1e4..9518e718d9 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtFunctionalCaseMapper.xml
@@ -837,7 +837,12 @@
     <select id="getMinderCaseReviewList" resultType="io.metersphere.functional.dto.FunctionalCaseMindDTO">
         SELECT
         crfc.id as id,
-        IFNULL(history.`status`, fc.review_status) as reviewStatus,
+        <if test="viewStatusUserId != null and viewStatusUserId != ''">
+            IFNULL(history.`status`, 'UN_REVIEWED') as reviewStatus,
+        </if>
+        <if test="viewStatusUserId == null or viewStatusUserId == ''">
+            IFNULL(history.`status`, crfc.status) as reviewStatus,
+        </if>
         fc.module_id as moduleId,
         fc.name as name,
         fc.id as caseId,
@@ -851,6 +856,9 @@
         <if test="viewStatusUserId != null and viewStatusUserId != ''">
             AND crh.create_user = #{viewStatusUserId}
         </if>
+        <if test="viewStatusUserId == null or viewStatusUserId == ''">
+            AND crh.create_user = null
+        </if>
         order by crh.create_time desc ) as history_filter WHERE rn = 1 ) as history  ON history.case_id = crfc.case_id
         WHERE
         crfc.review_id = #{request.reviewId}