正在显示
1 个修改的文件
包含
38 行增加
和
20 行删除
| @@ -616,29 +616,15 @@ class ProjectUpdate extends Command | @@ -616,29 +616,15 @@ class ProjectUpdate extends Command | ||
| 616 | } | 616 | } |
| 617 | 617 | ||
| 618 | //扩展字段 | 618 | //扩展字段 |
| 619 | - if ($item['extend'] ?? []) { | ||
| 620 | - foreach (array_reverse($item['extend']) as $ke => $ve) { | 619 | + if ($item['extend'][0] ?? []) { |
| 620 | + foreach ($item['extend'][0] as $ke => $ve) { | ||
| 621 | $extend = $extend_model->read(['title' => $ke]); | 621 | $extend = $extend_model->read(['title' => $ke]); |
| 622 | - if (!$extend) { | ||
| 623 | - $extend_key = $this->get_extend_key($extend_model); | ||
| 624 | - $extend_type = 1; | ||
| 625 | - $extend_model->add([ | ||
| 626 | - 'project_id' => $project_id, | ||
| 627 | - 'title' => $ke, | ||
| 628 | - 'type' => $extend_type, | ||
| 629 | - 'key' => $extend_key, | ||
| 630 | - 'module_id' => $custom_info['id'] | ||
| 631 | - ]); | ||
| 632 | - } else { | ||
| 633 | - $extend_key = $extend['key']; | ||
| 634 | - $extend_type = $extend['type']; | ||
| 635 | - } | ||
| 636 | - | ||
| 637 | - $extend_info = $extend_info_model->read(['key' => $extend_key, 'content_id' => $id]); | 622 | + if ($extend) { |
| 623 | + $extend_info = $extend_info_model->read(['key' => $extend['key'], 'content_id' => $id]); | ||
| 638 | if (!$extend_info) { | 624 | if (!$extend_info) { |
| 639 | $extend_info_model->add([ | 625 | $extend_info_model->add([ |
| 640 | - 'key' => $extend_key, | ||
| 641 | - 'type' => $extend_type, | 626 | + 'key' => $extend['key'], |
| 627 | + 'type' => $extend['type'], | ||
| 642 | 'project_id' => $project_id, | 628 | 'project_id' => $project_id, |
| 643 | 'content_id' => $id, | 629 | 'content_id' => $id, |
| 644 | 'module_id' => $custom_info['id'], | 630 | 'module_id' => $custom_info['id'], |
| @@ -647,6 +633,38 @@ class ProjectUpdate extends Command | @@ -647,6 +633,38 @@ class ProjectUpdate extends Command | ||
| 647 | } | 633 | } |
| 648 | } | 634 | } |
| 649 | } | 635 | } |
| 636 | + } | ||
| 637 | +// if ($item['extend'] ?? []) { | ||
| 638 | +// foreach (array_reverse($item['extend']) as $ke => $ve) { | ||
| 639 | +// $extend = $extend_model->read(['title' => $ke]); | ||
| 640 | +// if (!$extend) { | ||
| 641 | +// $extend_key = $this->get_extend_key($extend_model); | ||
| 642 | +// $extend_type = 1; | ||
| 643 | +// $extend_model->add([ | ||
| 644 | +// 'project_id' => $project_id, | ||
| 645 | +// 'title' => $ke, | ||
| 646 | +// 'type' => $extend_type, | ||
| 647 | +// 'key' => $extend_key, | ||
| 648 | +// 'module_id' => $custom_info['id'] | ||
| 649 | +// ]); | ||
| 650 | +// } else { | ||
| 651 | +// $extend_key = $extend['key']; | ||
| 652 | +// $extend_type = $extend['type']; | ||
| 653 | +// } | ||
| 654 | +// | ||
| 655 | +// $extend_info = $extend_info_model->read(['key' => $extend_key, 'content_id' => $id]); | ||
| 656 | +// if (!$extend_info) { | ||
| 657 | +// $extend_info_model->add([ | ||
| 658 | +// 'key' => $extend_key, | ||
| 659 | +// 'type' => $extend_type, | ||
| 660 | +// 'project_id' => $project_id, | ||
| 661 | +// 'content_id' => $id, | ||
| 662 | +// 'module_id' => $custom_info['id'], | ||
| 663 | +// 'values' => $ve, | ||
| 664 | +// ]); | ||
| 665 | +// } | ||
| 666 | +// } | ||
| 667 | +// } | ||
| 650 | } catch (\Exception $e) { | 668 | } catch (\Exception $e) { |
| 651 | echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', error: ' . $e->getMessage() . PHP_EOL; | 669 | echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', error: ' . $e->getMessage() . PHP_EOL; |
| 652 | continue; | 670 | continue; |
-
请 注册 或 登录 后发表评论