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

Lyh server



查看合并请求 !3344

@@ -152,11 +152,11 @@ class ProjectController extends BaseController
         if (isset($this->map['seo_plan']) && $this->map['seo_plan'] == 1) {
         if (isset($this->map['seo_plan']) && $this->map['seo_plan'] == 1) {
             $query = $query->orderBy('gl_project.cooperate_date', 'desc')->orderBy('gl_project.id', 'desc');
             $query = $query->orderBy('gl_project.cooperate_date', 'desc')->orderBy('gl_project.id', 'desc');
         } else {
         } else {
-//            if($this->map['type'] == 1){
-//                $query = $query->orderBy('gl_project.id', 'desc');
-//            }else{
+            if(isset($this->map['type']) && ($this->map['type'] == 1)){
+                $query = $query->orderBy('gl_project.id', 'desc');
+            }else{
                 $query = $query->orderBy('gl_project.uptime', 'desc')->orderBy('gl_project.id', 'desc');
                 $query = $query->orderBy('gl_project.uptime', 'desc')->orderBy('gl_project.id', 'desc');
-//            }
+            }
         }
         }
         return $query;
         return $query;
     }
     }

@@ -108,14 +108,15 @@ class Extension3915ModuleController extends BaseController
             $this->fail('当前项目不能调用当前方法');
             $this->fail('当前项目不能调用当前方法');
         }
         }
         $moduleFieldModel = new ExtensionModuleField();
         $moduleFieldModel = new ExtensionModuleField();
-        $filedList = $moduleFieldModel->where(['module_id' => $this->param['module_id']])->pluck('field_name', 'id')->toArray();
+        $filedList = $moduleFieldModel->where(['module_id' => $this->param['module_id']])->pluck( 'id','field_name')->toArray();
         if(empty($filedList)){
         if(empty($filedList)){
-            $this->response('请先设置字段，再添加数据',Code::SUCCESS);
+            $this->fail('请先设置字段，再添加数据');
         }
         }
         $data = $this->param['data'];
         $data = $this->param['data'];
         $moduleValueModel = new ExtensionModuleValue();
         $moduleValueModel = new ExtensionModuleValue();
         $key_filedId = [];
         $key_filedId = [];
         $resultData = [];
         $resultData = [];
+        try {
             foreach ($data as $k => $v){
             foreach ($data as $k => $v){
                 foreach ($v as $k1 => $v1){
                 foreach ($v as $k1 => $v1){
                     if($k == 0){
                     if($k == 0){
@@ -137,6 +138,9 @@ class Extension3915ModuleController extends BaseController
                 $moduleValueModel->truncate();
                 $moduleValueModel->truncate();
                 $moduleValueModel->insertAll($resultData);
                 $moduleValueModel->insertAll($resultData);
             }
             }
+        }catch (\Exception $e){
+            $this->fail('当前文件不能导入，请修改后再导入');
+        }
         $this->response('success',Code::SUCCESS,$resultData);
         $this->response('success',Code::SUCCESS,$resultData);
     }
     }
 }
 }