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 1d96526..2dc5724 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: