From d02b4273ecac69be9318a67dfe2e1c1033ed8e14 Mon Sep 17 00:00:00 2001
From: WangXu10 <xu.wang@fit2cloud.com>
Date: Sun, 18 Feb 2024 11:05:49 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=97=A5=E5=BF=97=E6=8C=89=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1035355 --user=王旭 【系统管理】组织-日志，操作类型中除了增删改查部分类型无数据 https://www.tapd.cn/55049933/s/1461803
---
 .../mapper/ExtCaseReviewHistoryMapper.xml     |  1 +
 .../system/mapper/BaseOperationLogMapper.xml  | 36 ++++++++++---------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewHistoryMapper.xml b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewHistoryMapper.xml
index 3cf081e714..243867ae82 100644
--- a/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewHistoryMapper.xml
+++ b/backend/services/case-management/src/main/java/io/metersphere/functional/mapper/ExtCaseReviewHistoryMapper.xml
@@ -95,6 +95,7 @@
                 #{caseId}
             </foreach>
           AND abandoned = FALSE
+          AND status != 'UNDER_REVIEWED'
         order by create_time desc
     </select>
 
diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/BaseOperationLogMapper.xml b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/BaseOperationLogMapper.xml
index e328b61a31..2d81758fe9 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/BaseOperationLogMapper.xml
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/mapper/BaseOperationLogMapper.xml
@@ -21,23 +21,25 @@
             <if test="request.startTime != null and request.endTime != null">
                 AND t.create_time BETWEEN #{request.startTime} AND #{request.endTime}
             </if>
-            <if test="request.level != null and request.level != 'SYSTEM'">
-                AND t.project_id <![CDATA[<>]]> 'SYSTEM'
-            </if>
-            <if test="request.level != null and request.level == 'PROJECT'">
-                AND t.project_id <![CDATA[<>]]> 'ORGANIZATION'
-            </if>
-            <if test="request.projectIds != null and request.projectIds.size > 0 ">
-                AND t.project_id IN
-                <foreach collection="request.projectIds" item="projectId" separator="," open="(" close=")">
-                    #{projectId}
-                </foreach>
-            </if>
-            <if test="request.organizationIds != null and request.organizationIds.size > 0 ">
-                AND t.organization_id IN
-                <foreach collection="request.organizationIds" item="organizationId" separator="," open="(" close=")">
-                    #{organizationId}
-                </foreach>
+            <if test="request.type != 'LOGOUT' and request.type !='LOGIN'">
+                <if test="request.level != null and request.level != 'SYSTEM'">
+                    AND t.project_id <![CDATA[<>]]> 'SYSTEM'
+                </if>
+                <if test="request.level != null and request.level == 'PROJECT'">
+                    AND t.project_id <![CDATA[<>]]> 'ORGANIZATION'
+                </if>
+                <if test="request.projectIds != null and request.projectIds.size > 0 ">
+                    AND t.project_id IN
+                    <foreach collection="request.projectIds" item="projectId" separator="," open="(" close=")">
+                        #{projectId}
+                    </foreach>
+                </if>
+                <if test="request.organizationIds != null and request.organizationIds.size > 0 ">
+                    AND t.organization_id IN
+                    <foreach collection="request.organizationIds" item="organizationId" separator="," open="(" close=")">
+                        #{organizationId}
+                    </foreach>
+                </if>
             </if>
             <if test="request.type != null and request.type != ''">
                 AND t.type = #{request.type}