|
|
@ -321,7 +321,7 @@ public class TaskDeliverService implements ITaskDeliverService { |
|
|
|
data.setDeliverId(taskDeliver.getId()); |
|
|
|
data.setDeliverName(taskDeliver.getName()); |
|
|
|
data.setRoleId(roleId); |
|
|
|
data.setTaskId(taskDetail.getId()); |
|
|
|
data.setTaskId(uploadDeliver.getTaskId()); |
|
|
|
data.setUploader(currentUserId); |
|
|
|
data.setUploadTime(now); |
|
|
|
data.setFile(uploadDeliver.getFileInfo()); |
|
|
@ -811,7 +811,7 @@ public class TaskDeliverService implements ITaskDeliverService { |
|
|
|
} else { |
|
|
|
checkerDtoData.setRoleId(task.getExecutorRole()); |
|
|
|
} |
|
|
|
checkerDtoData.setTaskId(task.getId()); |
|
|
|
checkerDtoData.setTaskId(checkDeliver.getTaskId()); |
|
|
|
checkerDtoData.setDeliverId(deliver.getId()); |
|
|
|
checkerDtoData.setDeliverName(deliver.getName()); |
|
|
|
if(ObjectUtil.isNotNull(checkRole)) { |
|
|
|