From f8ef60829dcab7c3ba4aaa2a9c104e232fee0d37 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 9 Jan 2024 10:44:45 +0800
Subject: [PATCH] =?UTF-8?q?fix=2080356=20=E4=BB=BB=E5=8A=A1=E8=BD=AC?=
 =?UTF-8?q?=E4=BA=A4-=E6=B5=81=E7=A8=8B=E4=BF=A1=E6=81=AF=EF=BC=8C?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LawsTaskTransferServiceImpl.java             | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/impl/LawsTaskTransferServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/impl/LawsTaskTransferServiceImpl.java
index e185ddad..72dd39dd 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/impl/LawsTaskTransferServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/tasktransfer/service/impl/LawsTaskTransferServiceImpl.java
@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.system.vo.LoginUser;
+import com.jero.modules.activiti.enums.FinishFlagEnum;
+import com.jero.modules.activiti.enums.ProcessStatusEnum;
 import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
 import com.jero.modules.compare.entity.SarFileCompareInfo;
 import com.jero.modules.compare.service.ISarFileCompareInfoService;
@@ -89,6 +91,8 @@ public class LawsTaskTransferServiceImpl implements ILawsTaskTransferService {
         queryWrapper.eq(!Objects.isNull(lawsProcessDb.getPrcType()), "prc_type", lawsProcessDb.getPrcType());
         queryWrapper.like(StringUtils.isNotBlank(lawsProcessDb.getTaskName()), "task_name", lawsProcessDb.getTaskName());
         queryWrapper.like(StringUtils.isNotBlank(lawsProcessDb.getPrcName()), "pa.prc_name", lawsProcessDb.getPrcName());
+        queryWrapper.eq("par.finish_flag", FinishFlagEnum.INCOMPLETE.getValue());
+        queryWrapper.ne("pa.prc_status", ProcessStatusEnum.WITHDRAWN.getValue());
         queryWrapper.orderByDesc("par.create_time");
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String roleIds = loginUser.getRoleIds();