|
@@ -73,12 +73,14 @@ class Protector extends Backend
|
|
|
case 'overdue': //已过期
|
|
|
$total = $this->model
|
|
|
->where('status',$this->status['OVERDUE'])
|
|
|
+ ->whereOr('status',$this->status['GIVEUP'])
|
|
|
->where($where_usr_id)
|
|
|
->where($where)
|
|
|
->order($sort, $order)
|
|
|
->count();
|
|
|
$list = $this->model
|
|
|
->where('status',$this->status['OVERDUE'])
|
|
|
+ ->whereOr('status',$this->status['GIVEUP'])
|
|
|
->where($where_usr_id)
|
|
|
->where($where)
|
|
|
->order($sort, $order)
|