From 668b86f12b92e313c2b52e5e8d692486f2d374d1 Mon Sep 17 00:00:00 2001
From: Rubik-W <39549317+Rubik-W@users.noreply.github.com>
Date: Sat, 28 Mar 2020 15:50:14 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9AOptimize=20content=20returned=20by?=
 =?UTF-8?q?=20interface=20(#2294)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/service/ProcessInstanceService.java               | 8 +-------
 .../dao/mapper/ProcessDefinitionMapper.xml                | 4 +++-
 .../dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml | 7 ++++++-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java
index 3530c66ff6..c53c288c7b 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java
@@ -204,14 +204,8 @@ public class ProcessInstanceService extends BaseDAGService {
             }
         }
 
-        Set<String> exclusionSet = new HashSet<>();
-        exclusionSet.add(Constants.CLASS);
-        exclusionSet.add("locations");
-        exclusionSet.add("connects");
-        exclusionSet.add("processInstanceJson");
-
         pageInfo.setTotalCount((int) processInstanceList.getTotal());
-        pageInfo.setLists(CollectionUtils.getListByExclusion(processInstances, exclusionSet));
+        pageInfo.setLists(processInstances);
         result.put(Constants.DATA_LIST, pageInfo);
         putMsg(result, Status.SUCCESS);
         return result;
diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml
index c9086b9f83..0cabf800cd 100644
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml
@@ -29,7 +29,9 @@
         and pd.name = #{processDefinitionName}
     </select>
     <select id="queryDefineListPaging" resultType="org.apache.dolphinscheduler.dao.entity.ProcessDefinition">
-        SELECT td.*,sc.schedule_release_state,tu.user_name
+        SELECT td.id, td.name, td.version, td.release_state, td.project_id, td.user_id, td.description, td.global_params,
+               td.flag, td.receivers, td.receivers_cc, td.timeout, td.tenant_id, td.modify_by, td.update_time, td.create_time,
+               sc.schedule_release_state, tu.user_name
         FROM t_ds_process_definition td
         left join (select process_definition_id,release_state as schedule_release_state from t_ds_schedules group by process_definition_id,release_state) sc on sc.process_definition_id = td.id
         left join t_ds_user tu on  td.user_id = tu.id
diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
index 3559ca9c85..e5697d1a60 100644
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
@@ -66,7 +66,12 @@
     </select>
 
     <select id="queryProcessInstanceListPaging" resultType="org.apache.dolphinscheduler.dao.entity.ProcessInstance">
-        select instance.*
+        select instance.id, instance.name, instance.process_definition_id, instance.state, instance.recovery, instance.start_time,
+               instance.end_time, instance.run_times, instance.host, instance.command_type, instance.command_param, instance.task_depend_type,
+               instance.max_try_times, instance.failure_strategy, instance.warning_type, instance.warning_group_id, instance.schedule_time,
+               instance.command_start_time, instance.global_params, instance.flag, instance.is_sub_process, instance.executor_id,
+               instance.history_cmd, instance.dependence_schedule_times, instance.process_instance_priority, instance.worker_group_id,
+               instance.timeout, instance.tenant_id, instance.update_time
         from t_ds_process_instance instance
         join t_ds_process_definition define ON instance.process_definition_id = define.id
         where 1=1