|
|
@@ -46,8 +46,8 @@ class FinanceService extends Service
|
|
|
->where('a.del_time',0)
|
|
|
->where('b.del_time',0)
|
|
|
->select('a.finance_account_name','a.account','a.ifsc','a.crt_time','b.id','b.amount','b.status','b.confirm_time')
|
|
|
- ->ordertBy('b.status','asc')
|
|
|
- ->orderBy('a.id','asc');
|
|
|
+ ->orderBy('a.id','asc')
|
|
|
+ ->orderBy('b.status','asc');
|
|
|
|
|
|
if(! empty($data['finance_account_name'])) $model->where('a.finance_account_name', 'LIKE', '%'.$data['finance_account_name'].'%');
|
|
|
if(! empty($data['account'])) $model->where('a.account', 'LIKE', '%'.$data['account'].'%');
|
cqpCow