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}