bug修改
This commit is contained in:
@@ -683,6 +683,8 @@ class Activities extends adminApi
|
|||||||
}
|
}
|
||||||
if($gift_bag_id){
|
if($gift_bag_id){
|
||||||
$where['a.gift_bag_id'] = $gift_bag_id;
|
$where['a.gift_bag_id'] = $gift_bag_id;
|
||||||
|
}else{
|
||||||
|
$where['a.gift_bag_id'] = ['in', [1,2]];
|
||||||
}
|
}
|
||||||
if($begin_time){
|
if($begin_time){
|
||||||
$where['a.createtime'] = ['>=', strtotime($begin_time)];
|
$where['a.createtime'] = ['>=', strtotime($begin_time)];
|
||||||
|
|||||||
Reference in New Issue
Block a user