From 2aecfdf2a326f1a529b246ca37adab6f8943ea65 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Mon, 26 Apr 2021 17:46:27 +0800
Subject: [PATCH] 20210424v1.5

---
 .../main/java/com/ccsens/tall/service/TaskDeliverService.java | 4 ++--
 tall/src/main/resources/application.yml                       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java
index 13c6de2b..fd1b7ff2 100644
--- a/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java
@@ -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)) {
diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml
index b5408a3a..ebc544af 100644
--- a/tall/src/main/resources/application.yml
+++ b/tall/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
-    include: util-dev,common
+    active: test
+    include: util-test,common