From eccea059ea6fde48e63d0d010ef540176714a825 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 25 Dec 2023 16:43:48 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=B5=81=E7=A8=8B=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=20=E5=BE=85=E5=8A=9E/=E5=B7=B2=E5=8A=9E/=E5=B7=B2=E5=8F=91=20?= =?UTF-8?q?=E6=8E=92=E9=99=A4=E5=B7=B2=E6=92=A4=E5=9B=9E=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/activiti/controller/WorkCenterController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java b/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java index 8d42e061..8c72df20 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/controller/WorkCenterController.java @@ -8,6 +8,7 @@ import com.jero.common.system.vo.LoginUser; import com.jero.modules.activiti.entity.ProcessAll; import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.enums.FinishFlagEnum; +import com.jero.modules.activiti.enums.ProcessStatusEnum; import com.jero.modules.activiti.process.common.entity.ProcessDraft; import com.jero.modules.activiti.process.common.service.ProcessDraftService; import com.jero.modules.activiti.process.fb.service.IProcessHandleService; @@ -59,6 +60,7 @@ public class WorkCenterController { String userId = loginUser.getId(); queryWrapper.eq("par.user_id",userId); queryWrapper.eq("par.finish_flag", FinishFlagEnum.INCOMPLETE.getValue()); + queryWrapper.ne("pa.prc_status", ProcessStatusEnum.WITHDRAWN.getValue()); Page page = new Page<>(pageNo, pageSize); IPage todoList = processAllService.getTodoList(page, queryWrapper); @@ -76,7 +78,7 @@ public class WorkCenterController { String userId = loginUser.getId(); queryWrapper.eq("par.user_id",userId); queryWrapper.eq("par.finish_flag",FinishFlagEnum.COMPLETE.getValue()); - + queryWrapper.ne("pa.prc_status", ProcessStatusEnum.WITHDRAWN.getValue()); Page page = new Page<>(pageNo, pageSize); IPage completedList = processAllService.getCompletedList(page, queryWrapper); return Result.OK(completedList); @@ -92,6 +94,7 @@ public class WorkCenterController { LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String userId = loginUser.getId(); queryWrapper.eq("pa.create_user_id",userId); + queryWrapper.ne("pa.prc_status", ProcessStatusEnum.WITHDRAWN.getValue()); Page page = new Page<>(pageNo, pageSize); IPage sentList = processAllService.getSentList(page, queryWrapper);