From 662a1e2fcdecb3f62b090b44bd1b4fc2bfdd7cfe Mon Sep 17 00:00:00 2001
From: konbai <1527468660@qq.com>
Date: Sun, 18 Dec 2022 18:21:07 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E6=B5=81=E7=A8=8B=E7=AE=A1=E7=90=86):?=
 =?UTF-8?q?=20=E6=B5=81=E7=A8=8B=E9=83=A8=E7=BD=B2=E9=87=87=E7=94=A8=20Pro?=
 =?UTF-8?q?cessUtils=20=E5=B7=A5=E5=85=B7=E7=B1=BB=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/WfDeployServiceImpl.java     | 22 ++++---------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfDeployServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfDeployServiceImpl.java
index 98820cdf..f5c41c10 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfDeployServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/workflow/service/impl/WfDeployServiceImpl.java
@@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.workflow.domain.WfDeployForm;
 import com.ruoyi.flowable.core.domain.ProcessQuery;
+import com.ruoyi.flowable.utils.ProcessUtils;
+import com.ruoyi.workflow.domain.WfDeployForm;
 import com.ruoyi.workflow.domain.vo.WfDeployVo;
 import com.ruoyi.workflow.mapper.WfDeployFormMapper;
 import com.ruoyi.workflow.service.IWfDeployService;
@@ -44,22 +44,8 @@ public class WfDeployServiceImpl implements IWfDeployService {
             .latestVersion()
             .orderByProcessDefinitionKey()
             .asc();
-        if (StringUtils.isNotBlank(processQuery.getProcessKey())) {
-            processDefinitionQuery.processDefinitionKeyLike("%" + processQuery.getProcessKey() + "%");
-        }
-        if (StringUtils.isNotBlank(processQuery.getProcessName())) {
-            processDefinitionQuery.processDefinitionNameLike("%" + processQuery.getProcessName() + "%");
-        }
-        if (StringUtils.isNotBlank(processQuery.getCategory())) {
-            processDefinitionQuery.processDefinitionCategory(processQuery.getCategory());
-        }
-        if (StringUtils.isNotBlank(processQuery.getState())) {
-            if (SuspensionState.ACTIVE.toString().equals(processQuery.getState())) {
-                processDefinitionQuery.active();
-            } else if (SuspensionState.SUSPENDED.toString().equals(processQuery.getState())) {
-                processDefinitionQuery.suspended();
-            }
-        }
+        // 构建搜索条件
+        ProcessUtils.buildProcessSearch(processDefinitionQuery, processQuery);
         long pageTotal = processDefinitionQuery.count();
         if (pageTotal <= 0) {
             return TableDataInfo.build();