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();