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

Compare commits

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

2 Commits
fe42931606 ... b8dc7bb497

Author SHA1 Message Date
vine_liutk b8dc7bb497 Merge branch 'main' of https://gitea.hmily.club/pdkj/lcly-data-admin 2023-08-30 09:50:31 +08:00
vine_liutk bbe315f9df 调整 2023-08-30 09:50:24 +08:00
1 changed files with 6 additions and 2 deletions
Show Stats 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);
// $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){
$q->where('is_recommend', 1)->where('status', 1);
if($isRecommend){
$q->where('is_recommend', 1);
}
$q->where('status', 1);
}
return $q->where('type', $deviceType);
})->sort()->get();