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

gx数据



查看合并请求 !1434

@@ -187,7 +187,12 @@ class LyhImportTest extends Command
                     'project_id'=>$project_id,
                     'project_id'=>$project_id,
                     'values'=>$val[2],
                     'values'=>$val[2],
                 ];
                 ];
-                $extentInfoModel->addReturnId($extent);
+                try {
+                    $extentInfoModel->addReturnId($extent);
+                }catch (\Exception $e){
+                    echo '错误：'.$val[2];
+                }
+
             }
             }
             if(!empty($val[3])){
             if(!empty($val[3])){
                 $extent = [
                 $extent = [
@@ -196,7 +201,11 @@ class LyhImportTest extends Command
                     'project_id'=>$project_id,
                     'project_id'=>$project_id,
                     'values'=>$val[3],
                     'values'=>$val[3],
                 ];
                 ];
-                $extentInfoModel->addReturnId($extent);
+                try {
+                    $extentInfoModel->addReturnId($extent);
+                }catch (\Exception $e){
+                    echo '错误：'.$val[3];
+                }
             }
             }
             if(!empty($val[4])){
             if(!empty($val[4])){
                 $extent = [
                 $extent = [
@@ -205,7 +214,11 @@ class LyhImportTest extends Command
                     'project_id'=>$project_id,
                     'project_id'=>$project_id,
                     'values'=>$val[4],
                     'values'=>$val[4],
                 ];
                 ];
-                $extentInfoModel->addReturnId($extent);
+                try {
+                    $extentInfoModel->addReturnId($extent);
+                }catch (\Exception $e){
+                    echo '错误：'.$val[4];
+                }
             }
             }
             if(!empty($val[5])){
             if(!empty($val[5])){
                 $extent = [
                 $extent = [
@@ -214,7 +227,11 @@ class LyhImportTest extends Command
                     'project_id'=>$project_id,
                     'project_id'=>$project_id,
                     'values'=>$val[5],
                     'values'=>$val[5],
                 ];
                 ];
-                $extentInfoModel->addReturnId($extent);
+                try {
+                    $extentInfoModel->addReturnId($extent);
+                }catch (\Exception $e){
+                    echo '错误：'.$val[5];
+                }
             }
             }
             //产品描述
             //产品描述
             if(!empty($val[7])){
             if(!empty($val[7])){