|
@@ -83,11 +83,12 @@ public class ProcessTaskServiceImpl implements IProcessTaskService {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public TaskApprovalVO approvalInfo(Long instanceId, Long taskId) {
|
|
|
+ public TaskApprovalVO approvalInfo(ProcessInfoDTO dto) {
|
|
|
+ final Long instanceId = dto.getInstanceId();
|
|
|
FlwInstance flwInstance = flowLongEngine.queryService().getInstance(instanceId);
|
|
|
ApiAssert.isEmpty(flwInstance, "未发现指定审批流程");
|
|
|
TaskApprovalVO vo = new TaskApprovalVO();
|
|
|
- vo.setTaskId(taskId);
|
|
|
+ vo.setTaskId(dto.getTaskId());
|
|
|
vo.setCreateId(flwInstance.getCreateId());
|
|
|
vo.setCreateBy(flwInstance.getCreateBy());
|
|
|
vo.setCreateTime(flwInstance.getCreateTime());
|
|
@@ -97,8 +98,8 @@ public class ProcessTaskServiceImpl implements IProcessTaskService {
|
|
|
vo.setFormContent(flwProcessForm.getContent());
|
|
|
}
|
|
|
// 表单配置权限
|
|
|
- if (null != taskId) {
|
|
|
- FlwTask flwTask = this.getFlwTask(taskId);
|
|
|
+ if (null != dto.getTaskId()) {
|
|
|
+ FlwTask flwTask = this.getFlwTask(dto.getTaskId());
|
|
|
FlwExtInstance flwExtInstance = extInstanceMapper.selectById(instanceId);
|
|
|
ProcessModel processModel = flwExtInstance.model();
|
|
|
NodeModel nodeModel = processModel.getNode(flwTask.getTaskName());
|