xiangpei
2025-02-26 a22c582a4867ee5a3f27e89da7d20fa52008b32c
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -204,7 +204,7 @@
        identityService.setAuthenticatedUserId(sysUser.getUserId().toString());
        variables.put(ProcessConstants.PROCESS_INITIATOR, sysUser.getUserId());
        //测试容缺
        variables.put("miss", true);
        variables.put("a", 10);
        // 将该项目的申请人(业主方)作为流程中某些环节的处理人
        variables.put(ProcessConstants.DATA_LAUNCH, "dept:" + createBy);
        ProcessInstance processInstance = runtimeService.startProcessInstanceById(processDefId, projectId + "", variables);
@@ -306,9 +306,15 @@
                .active()
                .includeProcessVariables()
                .orderByTaskCreateTime().desc();
        List<String> insIds = baseMapper.getNormalInsIds();
        if (CollectionUtils.isEmpty(insIds)) {
            result.data(new ArrayList<>()).total(0L);
            return;
        } else {
            taskQuery.processInstanceIdIn(insIds);
        }
        if (StringUtils.isNotBlank(taskName)) {
            taskQuery.processDefinitionNameLike(taskName);
            taskQuery.taskNameLike(taskName);
        }
        if (!SecurityUtils.getLoginUser().getUser().isAdmin()) {
            taskQuery
@@ -430,9 +436,6 @@
            }
            this.distinctVo(taskVO);
            vos.add(taskVO);
        }
        if (vos.size() < pageSize) {
            result.total(vos.size());
        }
        result.put("taskList", vos);
    }
@@ -827,7 +830,7 @@
                .desc();
        if (StringUtils.isNotBlank(taskName)) {
            taskQuery.processDefinitionNameLike(taskName);
            taskQuery.taskNameLike(taskName);
        }
        result.total(taskQuery.count());
        List<Task> taskList = taskQuery.listPage(pageSize * (pageNum - 1), pageSize);