From 5bedc0ea1633366ba32fa59864c52571e8d422e8 Mon Sep 17 00:00:00 2001
From: yxt_djz <djz236@163.com>
Date: Sun, 23 Oct 2022 10:25:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/flowable/biz/flowtask/FlowTaskService.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
index 21b09cf102..cfdd1077ff 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
@@ -1839,7 +1839,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
         return rb.setData(list);
     }
 
-    public ResultBean<Page<FlowTaskDto>> businessTodoListForApp(String userSid,String companySid, List<BusinessTaskParam> params, int pageNum, int pageSize) {
+    public ResultBean<Page<FlowTaskDto>> businessTodoListForApp(String userSid,String orgPath, List<BusinessTaskParam> params, int pageNum, int pageSize) {
         Page<FlowTaskDto> page = new Page<>();
         TaskQuery taskQuery = taskService.createTaskQuery();
         // 流程参数
@@ -1861,11 +1861,13 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                 }
             }
         }
-        taskQuery.active()
+        TaskQuery or = taskQuery.active()
                 .includeProcessVariables()
-                .or()
-                .taskAssigneeLike("%" + userSid + "%")
-                .endOr()
+                ;
+        if(StringUtils.isNotBlank(orgPath)){
+              or.taskVariableValueEquals("orgPath", orgPath);
+        }
+                or.taskAssigneeLike("%" + userSid + "%")
                 .orderByTaskCreateTime().desc();
         // 查询筛选条件
         if (paramMap.get("startDate") != null && StringUtils.isNotBlank(paramMap.get("startDate").toString())) {