From 5775bcb58c4792fa1b99077852511645e115bdde Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Sun, 23 Oct 2022 11:15:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E5=88=87=E6=8D=A2=E6=9C=BA?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/flowable/biz/flowtask/FlowTaskController.java   | 8 +++++++-
 .../yxt/anrui/flowable/biz/flowtask/FlowTaskService.java  | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java
index 0c6e18ec54..878d0fcc26 100644
--- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java
+++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java
@@ -34,7 +34,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 
@@ -109,6 +108,13 @@ public class FlowTaskController implements FlowTaskFeign {
         int current = Integer.valueOf(businessTaskQuery.getCurrent() + "");
         List<BusinessTaskParam> fields = businessTaskQuery.getParams().getFields();
         String companySid="";
+        if(fields.size()>0){
+            for(BusinessTaskParam b:fields){
+                if(b.getField().equals(BusinessVariables.ORGPATH)){
+                    companySid=b.getValue();
+                }
+            }
+        }
         ResultBean<Page<FlowTaskDto>> resultBean = flowTaskService.businessTodoListForApp(userSid,companySid, fields, current, size);
         return resultBean;
     }
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 cfdd1077ff..66ce4f02c7 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
@@ -451,7 +451,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                 .includeProcessVariables()
                 .includeTaskLocalVariables();
                 if(StringUtils.isNotBlank(orgPath)){
-                  //  or.taskVariableValueEquals("orgPath", orgPath);
+                    or.taskVariableValueLike("orgPath", "%" + orgPath + "%");
                 }
                 //.taskCandidateGroupIn(roleSidList)
                 or.taskAssigneeLike("%" + userSid + "%")
@@ -1865,7 +1865,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                 .includeProcessVariables()
                 ;
         if(StringUtils.isNotBlank(orgPath)){
-              or.taskVariableValueEquals("orgPath", orgPath);
+              or.taskVariableValueLike("orgPath",  "%" + orgPath + "%");
         }
                 or.taskAssigneeLike("%" + userSid + "%")
                 .orderByTaskCreateTime().desc();