diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketTodoController.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketTodoController.java
index 40112e9e..be242e93 100644
--- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketTodoController.java
+++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/controller/QmsIssueTicketTodoController.java
@@ -12,7 +12,7 @@ import jakarta.validation.Valid;
 import org.springframework.web.bind.annotation.*;
 
 /**
- * 工单待办
+ * 质量问题工单待办
  */
 @RestController
 @RequestMapping("/ticket-todo-item")
diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketTodoControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketTodoControllerService.java
index e1837409..45a7bd64 100644
--- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketTodoControllerService.java
+++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketTodoControllerService.java
@@ -1,8 +1,13 @@
 package com.nflg.qms.admin.service;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.nflg.wms.common.pojo.qo.QmsTodoItemSearchQO;
 import com.nflg.wms.common.pojo.vo.QmsTodoItemVO;
+import com.nflg.wms.repository.entity.QmsIssueTicketProcess;
+import com.nflg.wms.repository.service.IQmsIssueTicketProcessService;
+import com.nflg.wms.repository.service.IQmsIssueTicketService;
 import com.nflg.wms.repository.service.IQmsIssueTicketToDoService;
 import com.nflg.wms.repository.service.IQmsTodoItemService;
 import jakarta.annotation.Resource;
@@ -17,10 +22,32 @@ public class QmsIssueTicketTodoControllerService {
     @Resource
     private IQmsIssueTicketToDoService issueTicketToDoService;
 
+    @Resource
+    private IQmsIssueTicketProcessService issueTicketProcessService;
+
     /**
      * 分页查询待办事项列表
      */
     public IPage<QmsTodoItemVO> search(QmsTodoItemSearchQO request) {
-        return issueTicketToDoService.search(request);
+        IPage<QmsTodoItemVO> pageData = issueTicketToDoService.search(request);
+        if (CollectionUtil.isNotEmpty(pageData.getRecords())) {
+            pageData.getRecords().forEach(item -> {
+                if (item.getStatus() != 2) {
+                    item.setCurrentHandleUserName(
+                            StrUtil.join(",",
+                                    issueTicketProcessService.lambdaQuery()
+                                            .select(QmsIssueTicketProcess::getHandlerUserName)
+                                            .eq(QmsIssueTicketProcess::getIssueTicketId, item.getTicketId())
+                                            .list()
+                                            .stream()
+                                            .map(QmsIssueTicketProcess::getHandlerUserName)
+                                            .toList()
+                            )
+
+                    );
+                }
+            });
+        }
+        return pageData;
     }
 }
diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsTodoItemVO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsTodoItemVO.java
index 7992fa2b..83c37c99 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsTodoItemVO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/vo/QmsTodoItemVO.java
@@ -12,6 +12,11 @@ public class QmsTodoItemVO {
 
     private Long id;
 
+    /**
+     * 工单id
+     */
+    private Long ticketId;
+
     /**
      * 工单编号
      */
@@ -40,7 +45,7 @@ public class QmsTodoItemVO {
     /**
      * 当前节点处理人
      */
-    private String currentUserName;
+    private String currentHandleUserName;
 
     /**
      * 流程结束时间
diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsIssueTicketToDoMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsIssueTicketToDoMapper.xml
index 258ee34e..3838d1fc 100644
--- a/nflg-wms-repository/src/main/resources/mapper/QmsIssueTicketToDoMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/QmsIssueTicketToDoMapper.xml
@@ -11,8 +11,8 @@
         END AS type,
         vit.*
         FROM qms_issue_ticket_todo itd
-        INNER JOIN v_qms_issue_ticket vit ON itd.source_id = vit.ticket_id
-        where itd.handler_user_id = #{userId}
+        INNER JOIN v_qms_issue_ticket vit ON itd.ticket_id = vit.ticket_id
+        where itd.handler_user_id = #{userId} and (vit.handler_user_id=#{userId} or vit.approval_user_id=#{userId})
         <if test="request.sourceType != null">
             AND vit.source_type = #{request.sourceType}
         </if>