From 114be06ea2e3dfac70f253657ced50554f8e0680 Mon Sep 17 00:00:00 2001
From: aikai <ZZL86tdd>
Date: Mon, 15 Apr 2024 19:31:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=88=97=E8=A1=A8=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E7=AD=9B=E9=80=89bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/worklog/LogInstanceMapper.xml      | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml
index 4e3480d0..f5d67ad8 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml
+++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogInstanceMapper.xml
@@ -105,21 +105,21 @@
 
     <select id="selectPageResult" resultType="cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance.LogInstanceRespVO">
         SELECT
-            a.*,
-            e.read_status AS readStatus,
-            COUNT(b.work_log_id) AS comment,
-            COUNT(c.log_instance_id) AS readCount,
-            COUNT(d.log_instance_id) AS unreadCount
+        a.*,
+        e.read_status AS readStatus,
+        COUNT(b.work_log_id) AS comment,
+        COUNT(c.log_instance_id) AS readCount,
+        COUNT(d.log_instance_id) AS unreadCount
         FROM
-            work_log_instance_ext as a
-                LEFT JOIN work_log_comment as b ON a.id = b.work_log_id
-                LEFT JOIN work_log_read as e ON a.id = e.log_instance_id and e.read_user_id = #{userId}
-                LEFT JOIN work_log_read as c ON a.id = c.log_instance_id and c.read_status = 1
-                LEFT JOIN work_log_read as d ON a.id = d.log_instance_id and d.read_status = 0
+        work_log_instance_ext as a
+        LEFT JOIN work_log_comment as b ON a.id = b.work_log_id
+        LEFT JOIN work_log_read as e ON a.id = e.log_instance_id and e.read_user_id = #{userId}
+        LEFT JOIN work_log_read as c ON a.id = c.log_instance_id and c.read_status = 1
+        LEFT JOIN work_log_read as d ON a.id = d.log_instance_id and d.read_status = 0
         <where>
             <if test="logId != null">
                 and a.id = #{logId}
-             </if>
+            </if>
             <if test="reqVO.type != null">
                 and a.type = #{reqVO.type}
             </if>
@@ -129,8 +129,13 @@
             <if test="reqVO.startUserId != null">
                 and a.start_user_id = #{reqVO.startUserId}
             </if>
-            <if test="reqVO.createTime != null">
-                and a.create_time BETWEEN #{reqVO.createTime[0]} and #{reqVO.createTime[1]}
+            <if test="reqVO.createTime != null and reqVO.createTime.length > 0">
+                <if test="reqVO.createTime[0] != null">
+                    and a.create_time &gt;= #{reqVO.createTime[0]}
+                </if>
+                <if test="reqVO.createTime[1] != null">
+                    and a.create_time &lt;= #{reqVO.createTime[1]}
+                </if>
             </if>
             <if test="reqVO.unRead != null">
                 and e.read_status = 0