From 105dfd96c12f6f34509f43c870798c3460319773 Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: Mon, 18 Mar 2024 20:33:39 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E6=88=91=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E5=BE=97=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E9=94=99?= =?UTF-8?q?=E8=AF=AF=EF=BC=8C=E8=B0=83=E6=95=B4=E6=92=A4=E9=94=80=E5=90=8E?= =?UTF-8?q?=E6=9C=AA=E5=8A=9E=E7=90=86=E4=BB=BB=E5=8A=A1=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/workflow/service/IActProcessInstanceService.java | 1 + .../workflow/service/impl/ActProcessInstanceServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java index e5ed6ca0c..388680455 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java @@ -102,6 +102,7 @@ public interface IActProcessInstanceService { * 分页查询当前登录人单据 * * @param processInstanceBo 参数 + * @param pageQuery 分页 * @return 结果 */ TableDataInfo getPageByCurrent(ProcessInstanceBo processInstanceBo, PageQuery pageQuery); diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java index f4e8df26f..b34821632 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java @@ -583,7 +583,7 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService BusinessStatusEnum.checkCancelStatus(processInstance.getBusinessStatus()); List taskList = QueryUtils.taskQuery(processInstanceId).list(); for (Task task : taskList) { - taskService.setAssignee(task.getId(), String.valueOf(LoginHelper.getUserId())); + taskService.setAssignee(task.getId(), null); taskService.addComment(task.getId(), processInstanceId, TaskStatusEnum.CANCEL.getStatus(), LoginHelper.getLoginUser().getNickname() + "：撤销申请"); } HistoricTaskInstance historicTaskInstance = QueryUtils.hisTaskInstanceQuery().finished().orderByHistoricTaskInstanceEndTime().asc().list().get(0); @@ -622,7 +622,7 @@ public class ActProcessInstanceServiceImpl implements IActProcessInstanceService public TableDataInfo getPageByCurrent(ProcessInstanceBo bo, PageQuery pageQuery) { List list = new ArrayList<>(); HistoricProcessInstanceQuery query = QueryUtils.hisInstanceQuery(); - query.startedBy(bo.getStartUserId()); + query.startedBy(String.valueOf(LoginHelper.getUserId())); if (StringUtils.isNotBlank(bo.getName())) { query.processInstanceNameLikeIgnoreCase("%" + bo.getName() + "%"); }