From f527eefef0c9d43a38ed8298d24fe8a6cad27b61 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 15 Jul 2021 11:30:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8A=BD=E5=8F=96=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dataset/DataSetTableTaskService.java     |  2 +-
 .../dataease/service/dataset/ExtractDataService.java |  2 +-
 frontend/src/views/system/task/TaskRecord.vue        | 12 +++++++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
index ea49e52efa..22fc93d1a4 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
@@ -58,7 +58,7 @@ public class DataSetTableTaskService {
     public DatasetTableTask save(DataSetTaskRequest dataSetTaskRequest) throws Exception {
         checkName(dataSetTaskRequest);
         DatasetTableTask datasetTableTask = dataSetTaskRequest.getDatasetTableTask();
-        if(!datasetTableTask.getType().equalsIgnoreCase("add_scope")){
+        if(datasetTableTask.getType().equalsIgnoreCase("add_scope")){
             dataSetTableService.saveIncrementalConfig(dataSetTaskRequest.getDatasetTableIncrementalConfig());
         }
         // check
diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
index 8f9f0e684b..99ce8a58ce 100644
--- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
@@ -583,7 +583,7 @@ public class ExtractDataService {
         if (jobStatus.getStatusDescription().equals("Finished")) {
             return;
         } else {
-            DataEaseException.throwException((jobStatus.getErrorDescription()));
+            DataEaseException.throwException((jobStatus.getLoggingString()));
         }
     }
 
diff --git a/frontend/src/views/system/task/TaskRecord.vue b/frontend/src/views/system/task/TaskRecord.vue
index 2632e5bd0a..218e8e6e0b 100644
--- a/frontend/src/views/system/task/TaskRecord.vue
+++ b/frontend/src/views/system/task/TaskRecord.vue
@@ -36,7 +36,7 @@
       width="50%"
       class="dialog-css"
     >
-      <span>{{ error_massage }}</span>
+      <span class="err-msg">{{ error_massage }}</span>
       <span slot="footer" class="dialog-footer">
         <el-button size="mini" @click="show_error_massage = false">{{ $t('dataset.close') }}</el-button>
       </span>
@@ -176,6 +176,16 @@ export default {
   margin-bottom: 10px;
 }
 
+.err-msg{
+  font-size: 12px;
+  word-break:normal;
+  width:auto;
+  display:block;
+  white-space:pre-wrap;
+  word-wrap : break-word ;
+  overflow: hidden ;
+}
+
 span{
   font-size: 12px;
 }