From 4f481c96f6edda32d1143b6db4f56adb049402c0 Mon Sep 17 00:00:00 2001
From: zhengpengju <zpj0219@126.com>
Date: Fri, 25 Mar 2022 21:51:57 +0800
Subject: [PATCH] fix

---
 admin/src/pages/training/option/index.tsx | 59 ++++++-----------------
 1 file changed, 16 insertions(+), 43 deletions(-)

diff --git a/admin/src/pages/training/option/index.tsx b/admin/src/pages/training/option/index.tsx
index e12574b..be72b04 100644
--- a/admin/src/pages/training/option/index.tsx
+++ b/admin/src/pages/training/option/index.tsx
@@ -460,20 +460,14 @@ const TableList: React.FC = () => {
             // 表单处理
             //console.log('columns:', columns);
             console.log('values1:', values, orgTree);
-
-            const tree = orgTree.filter((item, idx, self) => {
-              return (values.org_names.indexOf(item.id) !== -1)
-            });
-
-            tree.map((e, i) => {
-              tree[i].org_id = e.id
-              tree[i].org_name = e.name
-              delete tree[i].id
-              delete tree[i].name
-              delete tree[i].pId
+            const tree = []
+            values.org_names.map((e) => {
+              tree.push({
+                org_type: 2,
+                org_id: e.value,
+                org_name: e.label
+              })
             })
-            console.log(321);
-            console.log(tree, 'tree');
             const _data = {
               ...values,
               end_time: values.date_time[1],
@@ -545,37 +539,17 @@ const TableList: React.FC = () => {
 
             onFinish={async (values: any) => {
               // 表单处理
-              //console.log('columns:', columns);
               console.log('values1:', values, values.org_names.value);
               // 处理机构数据。直接编辑与回显结构不够
-              let tree = []
-              if (typeof values.org_names[0] === 'number') {
-                // tree = values.org_names
-                console.log('true values.org_names', tree, values)
-                
-                tree = orgTree?.filter((item, idx, self) => {
-                  return (values?.org_names?.indexOf(item?.id) !== -1)
-                });
-                console.log("tree,1111", tree);
-                tree.map((e, i) => {
-                  tree[i].org_id = e.id
-                  tree[i].org_name = e.name
-                  delete tree[i].id
-                  delete tree[i].name
-                  delete tree[i].pId
-                })
-              } else {
-                values.org_names.map((e) => {
-                  tree.push({
-                    org_type: 2,
-                    org_id: e.value,
-                    org_name: e.label
-                  })
+              const tree = []
+              values.org_names.map((e) => {
+                tree.push({
+                  org_type: 2,
+                  org_id: e.value,
+                  org_name: e.label
                 })
+              })
 
-              }
-              console.log(321);
-              console.log(tree, 'tree');
               const _data = {
                 ...values,
                 end_time: values.date_time[1],
@@ -585,11 +559,10 @@ const TableList: React.FC = () => {
               }
               delete _data.date_time
               delete _data.org_names
-              // delete params.course_time
-              // delete params.examination_time
+
               console.log('_data', _data);
               const res = await saveTrain(_data);
-              // console.log(res, 'ressss');
+
               if (res.code === 2000) {
                 handleUpdateModalVisible(false);
                 actionRef.current?.reloadAndRest?.();