Browse Source

fix 修复我发起得列表查询错误,调整撤销后未办理任务设置null

gssong 1 year ago
parent
commit
105dfd96c1

+ 1 - 0
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<ProcessInstanceVo> getPageByCurrent(ProcessInstanceBo processInstanceBo, PageQuery pageQuery);

+ 2 - 2
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<Task> 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<ProcessInstanceVo> getPageByCurrent(ProcessInstanceBo bo, PageQuery pageQuery) {
         List<ProcessInstanceVo> 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() + "%");
         }