|
|
@@ -76,8 +76,14 @@ class CostBillPaid extends Backend
|
|
|
}else{
|
|
|
$item_id=3;
|
|
|
}
|
|
|
- $get_item=CostItem::where('village_id',$get['village_id'])->where('item',$item_id)->column('id');
|
|
|
- $where_and['item_id']=['in',$get_item];
|
|
|
+ if (isset($get['village_id'])){
|
|
|
+ $get_item=CostItem::where('village_id',$get['village_id'])->where('item',$item_id)->column('id');
|
|
|
+ $where_and['item_id']=['in',$get_item];
|
|
|
+ }else{
|
|
|
+ $get_item=CostItem::where('item',$item_id)->column('id');
|
|
|
+ $where_and['item_id']=['in',$get_item];
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
if (isset($get['pay_time'])){
|
