diff --git a/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java b/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java
index e74a99c..b38aafd 100644
--- a/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java
+++ b/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java
@@ -162,15 +162,18 @@ public class TaskInfoServiceImpl extends ServiceImpl<TaskInfoMapper, TaskInfo> i
         }
         HashMap<String, String> tableNameMap = new HashMap<>();
         String fieName = "";
-        HashMap<String, Long> hashMap = new HashMap<>();
+        HashMap<String, String> hashMap = new HashMap<>();
         for (int i = 0; i < list.size(); i++) {
             Long databaseId = list.get(i).getDatabaseId();
             longs.add(databaseId);
-            String tableFieId = list.get(i).getTableFieId();
-            String tableAsFieId = list.get(i).getTableAsFieId();
-//            String fieIdAsEngineId = list.get(i).getFieIdAsEngineId();
-//            hashMap.put(tableFieId,fieIdAsEngineId);
-//            tableNameMap.put(tableFieId,tableAsFieId);
+            String[] tableFieId = list.get(i).getTableFieId().split(",");
+            String[] tableAsFieId = list.get(i).getTableAsFieId().split(",");
+            String[] fieIdAsEngineId = list.get(i).getFieIdAsEngineId().split(",");
+            for (int j = 0; j < tableFieId.length; j++) {
+                hashMap.put(tableFieId[j],fieIdAsEngineId[j]);
+                tableNameMap.put(tableFieId[j],tableAsFieId[j]);
+            }
+
         }
         if (longs.size() > 1) {
             return "你选择的不是同一个数据库";
@@ -183,12 +186,16 @@ public class TaskInfoServiceImpl extends ServiceImpl<TaskInfoMapper, TaskInfo> i
         if (!CollectionUtils.isEmpty(jointList)) {
             for (NodeJoint nodeJoint : jointList) {
                 String oneNodeId = nodeJoint.getOneNodeId();
-                TaskInput taskInput = taskInputService.selectByNodeId(oneNodeId);
+                QueryWrapper<TaskInput> queryWrapper = new QueryWrapper<>();
+                queryWrapper.eq("node_id", oneNodeId);
+                TaskInput taskInput = taskInputService.getOne(queryWrapper);
                 String tableName = taskInput.getTableName();
                 String tableAsName = taskInput.getTableAsName();
 
                 String twoNodeId = nodeJoint.getTwoNodeId();
-                TaskInput taskInputTwo = taskInputService.selectByNodeId(twoNodeId);
+                QueryWrapper<TaskInput> queryWrapperTwo = new QueryWrapper<>();
+                queryWrapperTwo.eq("node_id", twoNodeId);
+                TaskInput taskInputTwo = taskInputService.getOne(queryWrapperTwo);
                 String tableNameTwo = taskInputTwo.getTableName();
                 String tableAsNameTwo = taskInputTwo.getTableAsName();
                 joint += " " + tableName + " " + " " + tableAsName + " " + nodeJoint.getJoint()
@@ -197,7 +204,7 @@ public class TaskInfoServiceImpl extends ServiceImpl<TaskInfoMapper, TaskInfo> i
 
             }
         }else {
-            TaskInput taskInput = taskInputService.selectByTaskId(taskId);
+            TaskInput taskInput = taskInputService.getOne(wrapper);
             String tableName = taskInput.getTableName();
             String tableAsName = taskInput.getTableAsName();
             joint=" "+ tableName+" "+tableAsName;
@@ -207,17 +214,15 @@ public class TaskInfoServiceImpl extends ServiceImpl<TaskInfoMapper, TaskInfo> i
 
         QueryWrapper<TaskOutput> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("task_id", taskId);
-        List<TaskOutput> list1 = taskOutputService.list(queryWrapper);
+        TaskOutput one = taskOutputService.getOne(queryWrapper);
+        Long tableId = one.getTableId();
+        Long newBasicId = one.getBasicId();
         HashMap<String, String> map = new HashMap<>();
-        Long tableId=null;
-        Long newBasicId=null;
-        for (TaskOutput taskOutput : list1) {
-            tableId=taskOutput.getTableId();
-            newBasicId=taskOutput.getBasicId();
-            String lastFieName = taskOutput.getLastFieName();
-            String newFieName = taskOutput.getNewFieName();
-            map.put(lastFieName, newFieName);
-            fieName += "," + tableNameMap.get(lastFieName);
+        String[] newFieName = one.getNewFieName().split(",");
+        String[] lastFieName = one.getLastFieName().split(",");
+        for (int i = 0; i < newFieName.length; i++) {
+            map.put(lastFieName[i], newFieName[i]);
+            fieName += "," + tableNameMap.get(lastFieName[i]);
         }
         fieName = fieName.substring(1);
         String sql = " SELECT " + fieName + " FROM "+ joint;