import

@@ -64,17 +64,17 @@ class ProjectImport extends Command
         }
         }
 
 
         $success_count = 0;  //成功导入条数
         $success_count = 0;  //成功导入条数
-        $count_line = count($line_of_text); //总条数
-        if ($count_line > 1) {
+        $total_count = 0; //总条数
+        if (count($line_of_text) > 1) {
             $task->status = ImportTask::STATUS_ING;//导入中
             $task->status = ImportTask::STATUS_ING;//导入中
-            $task->total_count = $count_line - 1;
             $task->save();
             $task->save();
 
 
             //设置数据库
             //设置数据库
             $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) {
+                    if ($k > 0 && $v) {
+                        $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)) {
                                 $success_count += 1;
                                 $success_count += 1;
@@ -91,7 +91,7 @@ class ProjectImport extends Command
         $task->success_count = $success_count;
         $task->success_count = $success_count;
         $task->save();
         $task->save();
 
 
-        echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', import end, total count: ' . ($count_line - 1) . ', success count: ' . $success_count . PHP_EOL;
+        echo 'date:' . date('Y-m-d H:i:s') . ', task_id: ' . $task->id . ', import end, total count: ' . $total_count . ', success count: ' . $success_count . PHP_EOL;
 
 
         sleep(2);
         sleep(2);
     }
     }

@@ -295,8 +295,10 @@ class NewsLogic extends BaseLogic
             //更新路由
             //更新路由
             $route = RouteMap::setRoute($data[0], RouteMap::SOURCE_NEWS, $id, $project_id);
             $route = RouteMap::setRoute($data[0], RouteMap::SOURCE_NEWS, $id, $project_id);
             $this->edit(['url' => $route], ['id' => $id]);
             $this->edit(['url' => $route], ['id' => $id]);
+
+            return true;
         }
         }
 
 
-        return true;
+        return false;
     }
     }
 }
 }