ChenWuJie 4 年之前
父節點
當前提交
ff35306588

+ 1 - 1
app/Http/Controllers/Api/mini/DataController.php

xqd
@@ -434,7 +434,7 @@ class DataController extends BaseController
         //如果初始进来不传筛选的年份,那就默认选择当前的年份
         $project_year = $request->input('project_year')? $request->input('project_year'):date('Y',time());
         //如果有项目id,那就用项目id,如果没有就默认选择第一个项目
-        if ($request->input('project_id')!=-1)
+        if ($request->input('project_id')!=0)
         {
             $all_project = 0;
             $project_id = $request->input('project_id') ? $request->input('project_id') : Project::where('id','>',1)->first()->id;

+ 1 - 1
app/Http/Controllers/Api/mini/ProjectController.php

xqd
@@ -101,7 +101,7 @@ class ProjectController extends BaseController
         if($request->input('type') == 'drop_menu') {
             $items = $this->model->where('id','>',1)->select('name as text', 'id as value')->orderBy('value')->get();
             $items = $items->prepend(collect(['text' => '请选择项目', 'value' => '']));
-            $items = $items->prepend(collect(['text' => '所有项目', 'value' => '-1']));
+            $items = $items->prepend(collect(['text' => '所有项目', 'value' => '0']));
             return $this->success(['data' => $items]);
         }
         $items = $this->model;