合并分支 'akun' 到 'master'

Akun



查看合并请求 !364

@@ -616,29 +616,15 @@ class ProjectUpdate extends Command
                                             }
                                             }
 
 
                                             //扩展字段
                                             //扩展字段
-                                            if ($item['extend'] ?? []) {
-                                                foreach (array_reverse($item['extend']) as $ke => $ve) {
+                                            if ($item['extend'][0] ?? []) {
+                                                foreach ($item['extend'][0] as $ke => $ve) {
                                                     $extend = $extend_model->read(['title' => $ke]);
                                                     $extend = $extend_model->read(['title' => $ke]);
-                                                    if (!$extend) {
-                                                        $extend_key = $this->get_extend_key($extend_model);
-                                                        $extend_type = 1;
-                                                        $extend_model->add([
-                                                            'project_id' => $project_id,
-                                                            'title' => $ke,
-                                                            'type' => $extend_type,
-                                                            'key' => $extend_key,
-                                                            'module_id' => $custom_info['id']
-                                                        ]);
-                                                    } else {
-                                                        $extend_key = $extend['key'];
-                                                        $extend_type = $extend['type'];
-                                                    }
-
-                                                    $extend_info = $extend_info_model->read(['key' => $extend_key, 'content_id' => $id]);
+                                                    if ($extend) {
+                                                        $extend_info = $extend_info_model->read(['key' => $extend['key'], 'content_id' => $id]);
                                                         if (!$extend_info) {
                                                         if (!$extend_info) {
                                                             $extend_info_model->add([
                                                             $extend_info_model->add([
-                                                            'key' => $extend_key,
-                                                            'type' => $extend_type,
+                                                                'key' => $extend['key'],
+                                                                'type' => $extend['type'],
                                                                 'project_id' => $project_id,
                                                                 'project_id' => $project_id,
                                                                 'content_id' => $id,
                                                                 'content_id' => $id,
                                                                 'module_id' => $custom_info['id'],
                                                                 'module_id' => $custom_info['id'],
@@ -647,6 +633,38 @@ class ProjectUpdate extends Command
                                                         }
                                                         }
                                                     }
                                                     }
                                                 }
                                                 }
+                                            }
+//                                            if ($item['extend'] ?? []) {
+//                                                foreach (array_reverse($item['extend']) as $ke => $ve) {
+//                                                    $extend = $extend_model->read(['title' => $ke]);
+//                                                    if (!$extend) {
+//                                                        $extend_key = $this->get_extend_key($extend_model);
+//                                                        $extend_type = 1;
+//                                                        $extend_model->add([
+//                                                            'project_id' => $project_id,
+//                                                            'title' => $ke,
+//                                                            'type' => $extend_type,
+//                                                            'key' => $extend_key,
+//                                                            'module_id' => $custom_info['id']
+//                                                        ]);
+//                                                    } else {
+//                                                        $extend_key = $extend['key'];
+//                                                        $extend_type = $extend['type'];
+//                                                    }
+//
+//                                                    $extend_info = $extend_info_model->read(['key' => $extend_key, 'content_id' => $id]);
+//                                                    if (!$extend_info) {
+//                                                        $extend_info_model->add([
+//                                                            'key' => $extend_key,
+//                                                            'type' => $extend_type,
+//                                                            'project_id' => $project_id,
+//                                                            'content_id' => $id,
+//                                                            'module_id' => $custom_info['id'],
+//                                                            'values' => $ve,
+//                                                        ]);
+//                                                    }
+//                                                }
+//                                            }
                                         } catch (\Exception $e) {
                                         } catch (\Exception $e) {
                                             echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', error: ' . $e->getMessage() . PHP_EOL;
                                             echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', error: ' . $e->getMessage() . PHP_EOL;
                                             continue;
                                             continue;