pdkj
/
lcly-data-admin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整

dev
vine_liutk 2023-08-30 09:50:24 +08:00
parent d8d3573860
commit bbe315f9df
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/AgriculturalBaseController.php
View File

@ -126,9 +126,13 @@ class AgriculturalBaseController extends Controller
{ {
$deviceType = $request->input('device_type', DeviceType::Monitor); $deviceType = $request->input('device_type', DeviceType::Monitor);
// $status = $request->input('status'); // $status = $request->input('status');
$list = AgriculturalBase::filter($request->all())->whereHas('devices', function ($q) use ($deviceType) { $isRecommend = $request->input('is_recommended', 1) ?? 0;
$list = AgriculturalBase::filter($request->all())->whereHas('devices', function ($q) use ($deviceType, $isRecommend) {
if($deviceType == DeviceType::Monitor || $deviceType == 1){ if($deviceType == DeviceType::Monitor || $deviceType == 1){
$q->where('is_recommend', 1)->where('status', 1); if($isRecommend){
$q->where('is_recommend', 1);
}
$q->where('status', 1);
} }
return $q->where('type', $deviceType); return $q->where('type', $deviceType);
})->sort()->get(); })->sort()->get();