Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -74,7 +74,7 @@ class ProjectImport extends Command
             $project = ProjectServer::useProject($task->project_id);
             $project = ProjectServer::useProject($task->project_id);
             if ($project) {
             if ($project) {
                 foreach ($line_of_text as $k => $v) {
                 foreach ($line_of_text as $k => $v) {
-                    if ($k > 0 && $v[0]) {
+                    if ($k > 0 && isset($v[0]) && $v[0]) {
                         $total_count += 1;
                         $total_count += 1;
                         if ($task->type == ImportTask::TYPE_NEWS) {
                         if ($task->type == ImportTask::TYPE_NEWS) {
                             if ((new NewsLogic())->importNews($task->project_id, $task->user_id, $v)) {
                             if ((new NewsLogic())->importNews($task->project_id, $task->user_id, $v)) {

@@ -292,7 +292,8 @@ class BlogLogic extends BaseLogic
                     'project_id' => $project_id,
                     'project_id' => $project_id,
                     'operator_id' => $user_id,
                     'operator_id' => $user_id,
                     'create_id' => $user_id,
                     'create_id' => $user_id,
-                    'status' => Blog::STATUS_ONE
+                    'status' => Blog::STATUS_ONE,
+                    'url' => ''
                 ]
                 ]
             );
             );
             //更新路由
             //更新路由

@@ -291,7 +291,8 @@ class NewsLogic extends BaseLogic
                     'project_id' => $project_id,
                     'project_id' => $project_id,
                     'operator_id' => $user_id,
                     'operator_id' => $user_id,
                     'create_id' => $user_id,
                     'create_id' => $user_id,
-                    'status' => News::STATUS_ONE
+                    'status' => News::STATUS_ONE,
+                    'url' => ''
                 ]
                 ]
             );
             );
             //更新路由
             //更新路由