合并分支 'lyh-server' 到 'master'

变更



查看合并请求 !2775

@@ -1663,10 +1663,11 @@ class LyhImportTest extends Command
                 $contentId = $customContentModel->addReturnId(['name'=>$item['name'],'image'=>$item['image'],'project_id'=>$project_id,'release_at'=>date('Y-m-d H:i:s'),'module_id'=>5]);
                 $contentId = $customContentModel->addReturnId(['name'=>$item['name'],'image'=>$item['image'],'project_id'=>$project_id,'release_at'=>date('Y-m-d H:i:s'),'module_id'=>5]);
                 $route = RouteMap::setRoute($contentId, RouteMap::SOURCE_MODULE, $contentId, $project_id);
                 $route = RouteMap::setRoute($contentId, RouteMap::SOURCE_MODULE, $contentId, $project_id);
                 $customContentModel->edit(['route'=>$route],['id'=>$contentId]);
                 $customContentModel->edit(['route'=>$route],['id'=>$contentId]);
-                $saveData = [
-                    ['key'=>'pd_extended_field_1', 'type'=>4, 'values'=>$item['href'], 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>5, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')],
-                ];
-                $customExtendContentTModel->insert($saveData);
+                $saveData = ['key'=>'pd_extended_field_1', 'type'=>4, 'values'=>json_encode([$item['href']],true), 'content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>5, 'created_at'=>date('Y-m-d H:i:s'), 'updated_at'=>date('Y-m-d H:i:s')];
+                $extendInfo = $customExtendContentTModel->read(['key'=>'pd_extended_field_1','content_id'=>$contentId, 'project_id'=>$project_id, 'module_id'=>5]);
+                if($extendInfo !== false){
+                    $customExtendContentTModel->edit($saveData,['id'=>$extendInfo['id']]);
+                }
             }
             }
         }
         }
         return true;
         return true;