From 13d7eea4a445836db23dfe975025126e0466d39f Mon Sep 17 00:00:00 2001
From: shuliYao <1397940314@qq.com>
Date: Mon, 1 Apr 2024 20:53:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=81=E8=A3=85=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java
index 1d96526e..2dc57244 100644
--- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java
+++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/flowable/service/impl/FlowTaskServiceImpl.java
@@ -1955,12 +1955,14 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
                 break;
             case "and":
                 // 添加 "and" 查询条件
-                SearchQuery andQuery = this.formattingSearchType1(new SearchQuery(), usersearchchild);
+                searchQuery.addRulesOp(usersearchchild.getSearchfield(),"and");
+                SearchQuery andQuery = this.formattingSearchType1(searchQuery, usersearchchild);
                 searchQuery.setSearchQuery(andQuery);
                 break;
             case "or":
                 // 添加 "or" 查询条件
-                SearchQuery orQuery = this.formattingSearchType1(new SearchQuery(), usersearchchild);
+                searchQuery.addRulesOp(usersearchchild.getSearchfield(),"or");
+                SearchQuery orQuery = this.formattingSearchType1(searchQuery, usersearchchild);
                 searchQuery.setSearchQuery(orQuery);
                 break;
             default: