正在显示
1 个修改的文件
包含
2 行增加
和
2 行删除
| @@ -169,8 +169,8 @@ class Business extends Base | @@ -169,8 +169,8 @@ class Business extends Base | ||
| 169 | ->join('verification_coupon d','c.verification_coupon_id=d.id') | 169 | ->join('verification_coupon d','c.verification_coupon_id=d.id') |
| 170 | ->field($field) | 170 | ->field($field) |
| 171 | ->join('user e','c.user_id=e.id') | 171 | ->join('user e','c.user_id=e.id') |
| 172 | - ->where($where) | ||
| 173 | ->whereOr($wheres) | 172 | ->whereOr($wheres) |
| 173 | + ->where($where) | ||
| 174 | ->paginate($total, false, ['page' => $page]) | 174 | ->paginate($total, false, ['page' => $page]) |
| 175 | ->toArray(); | 175 | ->toArray(); |
| 176 | $this->success('查询成功',$cancel); | 176 | $this->success('查询成功',$cancel); |
| @@ -206,9 +206,9 @@ class Business extends Base | @@ -206,9 +206,9 @@ class Business extends Base | ||
| 206 | $order=Db::name('verification_order') | 206 | $order=Db::name('verification_order') |
| 207 | ->alias('a') | 207 | ->alias('a') |
| 208 | ->join('verification_activity b','a.verification_activity_id=b.id') | 208 | ->join('verification_activity b','a.verification_activity_id=b.id') |
| 209 | - ->where($where) | ||
| 210 | ->whereOr($wheres) | 209 | ->whereOr($wheres) |
| 211 | ->field($field) | 210 | ->field($field) |
| 211 | + ->where($where) | ||
| 212 | ->paginate($total, false, ['page' => $page]) | 212 | ->paginate($total, false, ['page' => $page]) |
| 213 | ->toArray(); | 213 | ->toArray(); |
| 214 | foreach ($order['data'] as $key => $value) { | 214 | foreach ($order['data'] as $key => $value) { |
-
请 注册 或 登录 后发表评论