diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/worklog/LogReadDo.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/worklog/LogReadDo.java
index 5b6321cf..61a916ea 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/worklog/LogReadDo.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/worklog/LogReadDo.java
@@ -51,4 +51,9 @@ public class LogReadDo extends BaseDO {
      * 1：已读
      */
     private Integer readStatus;
+
+    /**
+     * 是否删除
+     */
+    private Boolean deleted;
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java
index 46d5ff8d..d659d7c4 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/worklog/LogInstanceMapper.java
@@ -5,14 +5,18 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.datapermission.core.annotation.DataPermission;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance.LogInstancePageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance.LogInstanceRespVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.dept.PostDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.dept.UserPostDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogInstanceDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.worklog.LogReadDo;
 import cn.iocoder.yudao.module.system.service.worklog.dto.LogReadUserRespDTO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -41,15 +45,56 @@ public interface LogInstanceMapper extends BaseMapperX<LogInstanceDO> {
                 .in(LogInstanceDO::getTime, dateList));
     }
 
-//    List<LogInstanceRespVO> selectPageResult( @Param("reqVO") LogInstancePageReqVO reqVO,
-//                                              @Param("userId") Long userId,
-//                                              @Param("ids") List<Long> ids);
+    default IPage<LogInstanceRespVO> selectPageResult(@Param("page") IPage<LogInstanceRespVO> page,
+                                                      @Param("reqVO") LogInstancePageReqVO reqVO,
+                                                      @Param("userId") Long userId,
+                                                      @Param("pagingType") Integer pagingType,
+                                                      @Param("userIds") List<Long> userIds) {
 
-    IPage<LogInstanceRespVO> selectPageResult(@Param("page") IPage<LogInstanceRespVO> page,
-                                              @Param("reqVO") LogInstancePageReqVO reqVO,
-                                              @Param("userId") Long userId,
-                                              @Param("pagingType") Integer pagingType,
-                                              @Param("userIds") List<Long> userIds);
+        MPJLambdaWrapperX<LogInstanceDO> queryWrapper = new MPJLambdaWrapperX<>();
+        queryWrapper.selectAll(LogInstanceDO.class);
+        queryWrapper.selectAs("e.read_status", LogInstanceRespVO::getReadStatus);
+        queryWrapper.selectAs("COALESCE(c.readCount, 0)", LogInstanceRespVO::getReadCount);
+        queryWrapper.selectAs("COALESCE(d.unreadCount, 0)", LogInstanceRespVO::getUnreadCount);
+        queryWrapper.selectAs("COALESCE(b.comment, 0)", LogInstanceRespVO::getComment);
+        queryWrapper.innerJoin(UserPostDO.class, "userPost", UserPostDO::getUserId, LogInstanceDO::getStartUserId);
+        queryWrapper.innerJoin(DeptDO.class, "dept", DeptDO::getId, LogInstanceDO::getDeptId);
+        queryWrapper.innerJoin(PostDO.class, "post", PostDO::getId, UserPostDO::getPostId);
+        queryWrapper.leftJoin(LogReadDo.class, "e", on -> on
+                .eq(LogReadDo::getLogInstanceId, LogInstanceDO::getId)
+                .eq(LogReadDo::getReadUserId, userId)
+                .eq(LogReadDo::getDeleted, 0));
+        queryWrapper.leftJoin("(SELECT log_instance_id, COUNT(log_instance_id) AS readCount FROM work_log_read where read_status = 1 GROUP BY log_instance_id) c on t.id = c.log_instance_id");
+        queryWrapper.leftJoin("(SELECT log_instance_id, COUNT(log_instance_id) AS unReadCount FROM work_log_read where read_status = 0 GROUP BY log_instance_id) AS d ON t.id = d.log_instance_id");
+        queryWrapper.leftJoin("(SELECT work_log_id, COUNT(work_log_id) AS comment FROM work_log_comment GROUP BY work_log_id) AS b ON t.id = b.work_log_id");
+        queryWrapper.eqIfPresent(LogInstanceDO::getDeptId, reqVO.getDeptId());
+        queryWrapper.eqIfPresent(LogInstanceDO::getFormId, reqVO.getFormId());
+        queryWrapper.eqIfPresent(LogInstanceDO::getStartUserId, reqVO.getStartUserId());
+        queryWrapper.betweenIfPresent(LogInstanceDO::getTime, reqVO.getCreateTime());
+        queryWrapper.inIfPresent(LogInstanceDO::getStartUserId, userIds);
+
+        if (reqVO.getReadStatus() != null) {
+            queryWrapper.eq("e.read_status", reqVO.getReadStatus());
+        }
+        if (reqVO.getIsProduce() != null && reqVO.getIsProduce() == 1) {
+            queryWrapper.like(DeptDO::getFlag, "166");
+        }
+        if (reqVO.getIsProduce() != null && reqVO.getIsProduce() == 2) {
+            queryWrapper.notLike(DeptDO::getFlag, "166");
+        }
+        if (pagingType == 0) {
+            queryWrapper.ne(LogInstanceDO::getStartUserId, userId);
+        }
+        if (pagingType == 1) {
+            queryWrapper.eq(LogInstanceDO::getStartUserId, userId);
+        }
+        queryWrapper.groupBy(LogInstanceDO::getId);
+        queryWrapper.orderByDesc(LogInstanceDO::getTime);
+        queryWrapper.orderByAsc(PostDO::getSort);
+        queryWrapper.orderByDesc(LogInstanceDO::getCreateTime);
+
+        return selectJoinPage(page, LogInstanceRespVO.class, queryWrapper);
+    }
 
     default PageResult<LogInstanceDO> selectPage(LogInstancePageReqVO reqVO, Long userId,
                                                   Integer pagingType, List<Long> userIds) {
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java
index 92ffd7d3..ce3cf11a 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogInstanceServiceImpl.java
@@ -244,9 +244,6 @@ public class LogInstanceServiceImpl implements LogInstanceService {
             leaderUserIds = adminUserService.getUserByBoss();
         }
 
-//        PageResult<LogInstanceDO> pageList = logInstanceMapper.selectPage(pageReqVO, getLoginUserId(), pagingType, leaderUserIds);
-//        List<LogInstanceRespVO> records = logInstanceMapper.selectPageResult(pageReqVO, getLoginUserId(), convertList(pageList.getList(), LogInstanceDO::getId));
-
         Page<LogInstanceRespVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
         IPage<LogInstanceRespVO> pageList = logInstanceMapper.selectPageResult(page, pageReqVO, getLoginUserId(), pagingType, leaderUserIds);
         List<LogInstanceRespVO> records = pageList.getRecords();
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 ea9e0788..b3491b5b 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
@@ -94,54 +94,6 @@
         or  result.data_scope = 1 )
     </select>
 
-<!--    <select id="selectPageResult" resultType="cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance.LogInstanceRespVO">-->
-<!--        SELECT-->
-<!--            a.*,-->
-<!--            e.read_status as readStatus,-->
-<!--            COALESCE(c.readCount, 0) as readCount,-->
-<!--            COALESCE(d.unreadCount, 0) as unReadCount,-->
-<!--            COALESCE(b.comment, 0) as comment-->
-<!--        FROM-->
-<!--            system_user_post userPost,-->
-<!--            system_dept dept,-->
-<!--            system_post post,-->
-<!--            work_log_instance_ext as a-->
-<!--            LEFT JOIN work_log_read as e ON a.id = e.log_instance_id and e.read_user_id = #{userId}-->
-<!--            LEFT JOIN (SELECT log_instance_id, COUNT(log_instance_id) AS readCount FROM work_log_read where read_status = 1 AND deleted = 0 GROUP BY log_instance_id ) AS c ON a.id = c.log_instance_id-->
-<!--            LEFT JOIN (SELECT log_instance_id, COUNT(log_instance_id) AS unReadCount FROM work_log_read where read_status = 0 AND deleted = 0 GROUP BY log_instance_id ) AS d ON a.id = d.log_instance_id-->
-<!--            LEFT JOIN (SELECT work_log_id, COUNT(work_log_id) AS comment FROM work_log_comment where deleted = 0  GROUP BY work_log_id) AS b ON a.id = b.work_log_id-->
-<!--        <where>-->
-<!--            a.deleted = 0-->
-<!--            <if test="ids != null and ids.size > 0">-->
-<!--                and a.id in-->
-<!--                <foreach collection="ids" item="ids" open="(" close=")" separator=",">-->
-<!--                    #{ids}-->
-<!--                </foreach>-->
-<!--            </if>-->
-<!--            <if test="ids == null or ids.size == 0">-->
-<!--                and a.id = null-->
-<!--            </if>-->
-<!--            AND a.start_user_id = userPost.user_id-->
-<!--            AND userPost.post_id = post.id-->
-<!--            AND a.dept_id = dept.id-->
-<!--            <if test="reqVO.isProduce == 1">-->
-<!--                AND dept.flag LIKE '%166%'-->
-<!--            </if>-->
-<!--            <if test="reqVO.isProduce == 2">-->
-<!--                AND dept.flag NOT LIKE '%166%'-->
-<!--            </if>-->
-<!--            <if test="reqVO.readStatus != null">-->
-<!--                and e.read_status = #{reqVO.readStatus}-->
-<!--            </if>-->
-<!--        </where>-->
-<!--        GROUP BY a.id-->
-<!--        ORDER BY-->
-<!--            a.time DESC,-->
-<!--            post.sort,-->
-<!--            a.start_user_id-->
-<!--    </select>-->
-
-
     <select id="getNextOrUp"
             resultType="cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance.LogInstanceRespVO">
         SELECT
@@ -201,70 +153,70 @@
         limit 1
     </select>
 
-    <select id="selectPageResult" resultType="cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance.LogInstanceRespVO">
-        SELECT
-        a.*,
-        e.read_status as readStatus,
-        COALESCE(c.readCount, 0) as readCount,
-        COALESCE(d.unreadCount, 0) as unReadCount,
-        COALESCE(b.comment, 0) as comment
-        FROM
-        system_user_post userPost,
-        system_dept dept,
-        system_post post,
-        work_log_instance_ext as a
-        LEFT JOIN work_log_read as e ON a.id = e.log_instance_id and e.read_user_id = #{userId}
-        LEFT JOIN (SELECT log_instance_id, COUNT(log_instance_id) AS readCount FROM work_log_read where read_status = 1 AND deleted = 0 GROUP BY log_instance_id ) AS c ON a.id = c.log_instance_id
-        LEFT JOIN (SELECT log_instance_id, COUNT(log_instance_id) AS unReadCount FROM work_log_read where read_status = 0 AND deleted = 0 GROUP BY log_instance_id ) AS d ON a.id = d.log_instance_id
-        LEFT JOIN (SELECT work_log_id, COUNT(work_log_id) AS comment FROM work_log_comment where deleted = 0  GROUP BY work_log_id) AS b ON a.id = b.work_log_id
-        <where>
-            a.deleted = 0
-            AND a.start_user_id = userPost.user_id
-            AND userPost.post_id = post.id
-            AND a.dept_id = dept.id
-            <if test="reqVO.isProduce == 1">
-                AND dept.flag LIKE '%166%'
-            </if>
-            <if test="reqVO.isProduce == 2">
-                AND dept.flag NOT LIKE '%166%'
-            </if>
-            <if test="reqVO.formId != null">
-                and a.form_id = #{reqVO.formId}
-            </if>
-            <if test="reqVO.deptId != null">
-                and a.dept_id = #{reqVO.deptId}
-            </if>
-            <if test="reqVO.startUserId != null">
-                and a.start_user_id = #{reqVO.startUserId}
-            </if>
-            <if test="reqVO.createTime != null and reqVO.createTime.length > 0">
-                <if test="reqVO.createTime[0] != null">
-                    and a.time &gt;= #{reqVO.createTime[0]}
-                </if>
-                <if test="reqVO.createTime[1] != null">
-                    and a.time &lt;= #{reqVO.createTime[1]}
-                </if>
-            </if>
-            <if test="reqVO.readStatus != null">
-                and e.read_status = #{reqVO.readStatus}
-            </if>
-            <if test="pagingType == 0">
-                and a.start_user_id != #{userId}
-            </if>
-            <if test="pagingType == 1">
-                and a.start_user_id = #{userId}
-            </if>
-            <if test="reqVO.isBoss != null and reqVO.isProduce == null">
-                and a.start_user_id in
-                <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
-                    #{userId}
-                </foreach>
-            </if>
-        </where>
-        GROUP BY a.id
-        ORDER BY
-        a.time DESC,
-        post.sort,
-        a.create_time DESC
-    </select>
+<!--    <select id="selectPageResult" resultType="cn.iocoder.yudao.module.system.controller.admin.worklog.vo.loginstance.LogInstanceRespVO">-->
+<!--        SELECT-->
+<!--        a.*,-->
+<!--        e.read_status as readStatus,-->
+<!--        COALESCE(c.readCount, 0) as readCount,-->
+<!--        COALESCE(d.unreadCount, 0) as unReadCount,-->
+<!--        COALESCE(b.comment, 0) as comment-->
+<!--        FROM-->
+<!--        system_user_post userPost,-->
+<!--        system_dept dept,-->
+<!--        system_post post,-->
+<!--        work_log_instance_ext as a-->
+<!--        LEFT JOIN work_log_read as e ON a.id = e.log_instance_id and e.read_user_id = #{userId}-->
+<!--        LEFT JOIN (SELECT log_instance_id, COUNT(log_instance_id) AS readCount FROM work_log_read where read_status = 1 AND deleted = 0 GROUP BY log_instance_id ) AS c ON a.id = c.log_instance_id-->
+<!--        LEFT JOIN (SELECT log_instance_id, COUNT(log_instance_id) AS unReadCount FROM work_log_read where read_status = 0 AND deleted = 0 GROUP BY log_instance_id ) AS d ON a.id = d.log_instance_id-->
+<!--        LEFT JOIN (SELECT work_log_id, COUNT(work_log_id) AS comment FROM work_log_comment where deleted = 0  GROUP BY work_log_id) AS b ON a.id = b.work_log_id-->
+<!--        <where>-->
+<!--            a.deleted = 0-->
+<!--            AND a.start_user_id = userPost.user_id-->
+<!--            AND userPost.post_id = post.id-->
+<!--            AND a.dept_id = dept.id-->
+<!--            <if test="reqVO.isProduce == 1">-->
+<!--                AND dept.flag LIKE '%166%'-->
+<!--            </if>-->
+<!--            <if test="reqVO.isProduce == 2">-->
+<!--                AND dept.flag NOT LIKE '%166%'-->
+<!--            </if>-->
+<!--            <if test="reqVO.formId != null">-->
+<!--                and a.form_id = #{reqVO.formId}-->
+<!--            </if>-->
+<!--            <if test="reqVO.deptId != null">-->
+<!--                and a.dept_id = #{reqVO.deptId}-->
+<!--            </if>-->
+<!--            <if test="reqVO.startUserId != null">-->
+<!--                and a.start_user_id = #{reqVO.startUserId}-->
+<!--            </if>-->
+<!--            <if test="reqVO.createTime != null and reqVO.createTime.length > 0">-->
+<!--                <if test="reqVO.createTime[0] != null">-->
+<!--                    and a.time &gt;= #{reqVO.createTime[0]}-->
+<!--                </if>-->
+<!--                <if test="reqVO.createTime[1] != null">-->
+<!--                    and a.time &lt;= #{reqVO.createTime[1]}-->
+<!--                </if>-->
+<!--            </if>-->
+<!--            <if test="reqVO.readStatus != null">-->
+<!--                and e.read_status = #{reqVO.readStatus}-->
+<!--            </if>-->
+<!--            <if test="pagingType == 0">-->
+<!--                and a.start_user_id != #{userId}-->
+<!--            </if>-->
+<!--            <if test="pagingType == 1">-->
+<!--                and a.start_user_id = #{userId}-->
+<!--            </if>-->
+<!--            <if test="reqVO.isBoss != null and reqVO.isProduce == null">-->
+<!--                and a.start_user_id in-->
+<!--                <foreach collection="userIds" item="userId" open="(" close=")" separator=",">-->
+<!--                    #{userId}-->
+<!--                </foreach>-->
+<!--            </if>-->
+<!--        </where>-->
+<!--        GROUP BY a.id-->
+<!--        ORDER BY-->
+<!--        a.time DESC,-->
+<!--        post.sort,-->
+<!--        a.create_time DESC-->
+<!--    </select>-->
 </mapper>
\ No newline at end of file