|
...
|
...
|
@@ -99,7 +99,7 @@ class IndexController extends WeChatBaseController |
|
|
|
->order('l.row','dec')
|
|
|
|
->column('l.row');
|
|
|
|
foreach ($row as $k=>$v){
|
|
|
|
$arr[$v]=Db::name('light')->alias('l')->join('temple_area ta','l.area_id=ta.id')->where(['l.row'=>$v,'l.area_id'=>$param['id']])->select()->each(function ($item) {
|
|
|
|
$arr[$v]=Db::name('light')->alias('l')->join('temple_area ta','l.area_id=ta.id')->where(['l.row'=>$v,'l.area_id'=>$param['id']])->field('l.*,ta.name')->select()->each(function ($item) {
|
|
|
|
if(Db::name('light_order') ->where(['light_id'=>$item['id'],'end_time'=>['>',time()],'status'=>1])->find()){
|
|
|
|
$item['can_light'] =0;
|
|
|
|
}else{
|
...
|
...
|
|
