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

Compare commits

base: pdkj:b8dc7bb4974bb88885a64e0ff38b8ab8df1d3414
Branches Tags
pdkj:main
pdkj:dev
..
compare: pdkj:fe429316063c65ab6f7ec156df34f839a35328a4
Branches Tags
pdkj:main
pdkj:dev

No commits in common. "b8dc7bb4974bb88885a64e0ff38b8ab8df1d3414" and "fe429316063c65ab6f7ec156df34f839a35328a4" have entirely different histories.
b8dc7bb497 ... fe42931606

1 changed files with 2 additions and 6 deletions
Show Stats Expand all files Collapse all files

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

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