From 7513ecb61ddc021e55a1eedd20b4802ca2c9c26d Mon Sep 17 00:00:00 2001 From: lijiarao Date: Thu, 11 Jan 2024 17:08:00 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E8=8D=89=E7=A8=BF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=A9=BA=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/fb/controller/ProcessFbInfoController.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java index e683ad50..3410ab5b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java @@ -90,7 +90,11 @@ public class ProcessFbInfoController { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ProcessDraft::getUserId, CurrentUserUtil.getId()); queryWrapper.isNull(ProcessDraft::getTaskId); - queryWrapper.ne(ProcessDraft::getSaveSource, DraftCommon.INITIAL_SOURCE); + queryWrapper.and(a -> { + a.ne(ProcessDraft::getSaveSource, DraftCommon.INITIAL_SOURCE) + .or() + .isNull(ProcessDraft::getSaveSource); + }); queryWrapper.eq(!Objects.isNull(processDraft.getPrcType()), ProcessDraft::getPrcType, processDraft.getPrcType()); Page page = new Page<>(pageNo, pageSize); IPage sentList = processDraftService.page(page, queryWrapper);