|
@@ -1041,7 +1041,7 @@ class FinanceRepository extends BaseRepository
|
|
1041
|
$query = Db::name('user_bill')
|
1041
|
$query = Db::name('user_bill')
|
|
1042
|
->alias('ub')
|
1042
|
->alias('ub')
|
|
1043
|
->leftJoin('user u', 'u.uid=ub.uid')
|
1043
|
->leftJoin('user u', 'u.uid=ub.uid')
|
|
1044
|
- ->where('u.test_user', '!=', 1)
|
|
|
|
|
|
1044
|
+ ->where('u.test_user', '<>', 1)
|
|
1045
|
->when($mer_id, function ($query) use ($mer_id) {
|
1045
|
->when($mer_id, function ($query) use ($mer_id) {
|
|
1046
|
$query->where('ub.mer_id', $mer_id);
|
1046
|
$query->where('ub.mer_id', $mer_id);
|
|
1047
|
})
|
1047
|
})
|