|
|
@@ -59,7 +59,7 @@ class Devices extends Model
|
|
|
$day1 = $day1? strtotime(date('Y-m-d '.$day1)) : 0;
|
|
|
$day2 = $day2? strtotime(date('Y-m-d '.$day2)) : 0;
|
|
|
$curDate = date('Y-m-d H');
|
|
|
- $item['business'] = time()>= $day1 && time() <= $day2? 1 : 0;
|
|
|
+ $item['business'] = (time()>= $day1 && time() <= $day2) || empty($serviceTime)? 1 : 0;
|
|
|
|
|
|
return $item;
|
|
|
})
|