作者 lyh

gx

@@ -125,6 +125,9 @@ class ProjectController extends BaseController @@ -125,6 +125,9 @@ class ProjectController extends BaseController
125 $query->whereIn('gl_project.type', [Project::TYPE_FOUR,Project::TYPE_SIX]); 125 $query->whereIn('gl_project.type', [Project::TYPE_FOUR,Project::TYPE_SIX]);
126 } 126 }
127 } 127 }
  128 + if(isset($this->map['uptime']) && is_array($this->map['uptime'])){
  129 + $query->whereBetween('gl_project.uptime', $this->map['uptime']);
  130 + }
128 return $query; 131 return $query;
129 } 132 }
130 133
@@ -25,6 +25,7 @@ use App\Rules\Ids; @@ -25,6 +25,7 @@ use App\Rules\Ids;
25 use Illuminate\Http\Request; 25 use Illuminate\Http\Request;
26 use Illuminate\Support\Facades\Cache; 26 use Illuminate\Support\Facades\Cache;
27 use Illuminate\Support\Facades\DB; 27 use Illuminate\Support\Facades\DB;
  28 +use Illuminate\Support\Facades\Log;
28 29
29 /** 30 /**
30 * Class ProductController 31 * Class ProductController
@@ -496,7 +497,8 @@ class ProductController extends BaseController @@ -496,7 +497,8 @@ class ProductController extends BaseController
496 $setNumModel->add($param); 497 $setNumModel->add($param);
497 } 498 }
498 }catch (\Exception $e){ 499 }catch (\Exception $e){
499 - $this->fail('系统错误,请联系管理员'); 500 + Log::info('error file: ' . __CLASS__ . __FUNCTION__ . $e->getMessage());
  501 + $this->response('设置排序失败,请稍后重试',Code::SYSTEM_ERROR);
500 } 502 }
501 $this->response('success'); 503 $this->response('success');
502 } 504 }