合并分支 'akun' 到 'master'

Akun



查看合并请求 !432

@@ -665,8 +665,6 @@ class ProjectUpdate extends Command
                                                 foreach ($item['extend'] as $ke => $ve) {
                                                     $extend = $extend_model->read(['title' => $ke]);
                                                     if ($extend) {
-                                                        $extend_info = $extend_info_model->read(['key' => $extend['key'], 'content_id' => $id]);
-                                                        if (!$extend_info) {
                                                         if ($extend['type'] == 3) {
                                                             $gallery = [];
                                                             if (is_array($ve)) {
@@ -682,6 +680,9 @@ class ProjectUpdate extends Command
                                                         } else {
                                                             $value = $ve;
                                                         }
+
+                                                        $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'],
@@ -690,6 +691,8 @@ class ProjectUpdate extends Command
                                                                 'module_id' => $custom_info['id'],
                                                                 'values' => $value,
                                                             ]);
+                                                        } else {
+                                                            $extend_info_model->edit(['type' => $extend['type'], 'value' => $value], ['key' => $extend['key'], 'content_id' => $id]);
                                                         }
                                                     }
                                                 }