From 3bef8e804938940961e4604381a09f067823b28f Mon Sep 17 00:00:00 2001
From: TS-QD1 <tskj_pc1@163.com>
Date: Fri, 7 Apr 2023 18:49:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=80=9A=E8=BF=87=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7ID=E8=8E=B7=E5=8F=96=E4=BB=A3=E5=8A=9E=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ink/wgink/module/activiti/service/oa/IOaService.java | 9 +++++++++
 .../module/activiti/service/oa/impl/OaServiceImpl.java   | 7 +++++++
 2 files changed, 16 insertions(+)

diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/IOaService.java b/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/IOaService.java
index 4ae66fae..a19d9c84 100644
--- a/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/IOaService.java
+++ b/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/IOaService.java
@@ -56,6 +56,15 @@ public interface IOaService {
      */
     List<OaTaskDTO> listTaskByUserId(String userId);
 
+    /**
+     * 用户的任务（待办）
+     *
+     * @param processInstanceId 实例ID
+     * @param userId
+     * @return
+     */
+    List<OaTaskDTO> listTaskByProcessDefinitionKeyAndUserId(String processInstanceId, String userId);
+
     /**
      * 我的任务（待办）总数
      *
diff --git a/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaServiceImpl.java b/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaServiceImpl.java
index 468d309f..036e1534 100644
--- a/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaServiceImpl.java
+++ b/module-activiti/src/main/java/ink/wgink/module/activiti/service/oa/impl/OaServiceImpl.java
@@ -148,6 +148,13 @@ public class OaServiceImpl extends DefaultBaseService implements IOaService {
         return listOaTask(tasks);
     }
 
+    @Override
+    public List<OaTaskDTO> listTaskByProcessDefinitionKeyAndUserId(String processDefinitionKey, String userId) {
+        TaskQuery taskQuery = taskService.createTaskQuery().taskCandidateOrAssigned(userId).processDefinitionKey(processDefinitionKey);
+        List<Task> tasks = taskQuery.includeProcessVariables().list();
+        return listOaTask(tasks);
+    }
+
     @Override
     public Long countTaskOfMine() {
         String userId = securityComponent.getCurrentUser().getUserId();