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