Browse Source

update: fix user filter

tokumeikoi 3 years ago
parent
commit
90211c1018

+ 1 - 1
app/Http/Controllers/Admin/CouponController.php

@@ -19,7 +19,7 @@ class CouponController extends Controller
         $current = $request->input('current') ? $request->input('current') : 1;
         $pageSize = $request->input('pageSize') >= 10 ? $request->input('pageSize') : 10;
         $sortType = in_array($request->input('sort_type'), ['ASC', 'DESC']) ? $request->input('sort_type') : 'DESC';
-        $sort = $request->input('sort') ? $request->input('sort') : 'created_at';
+        $sort = $request->input('sort') ? $request->input('sort') : 'id';
         $builder = Coupon::orderBy($sort, $sortType);
         $total = $builder->count();
         $coupons = $builder->forPage($current, $pageSize)

+ 7 - 8
app/Http/Controllers/Admin/UserController.php

@@ -32,18 +32,17 @@ class UserController extends Controller
     {
         if ($request->input('filter')) {
             foreach ($request->input('filter') as $filter) {
-                if ($filter['key'] === 'invite_by_email') {
-                    $user = User::where('email', $filter['value'])->first();
-                    if (!$user) continue;
-                    $builder->where('invite_user_id', $user->id);
-                    continue;
+                if ($filter['condition'] === '模糊') {
+                    $filter['condition'] = 'like';
+                    $filter['value'] = "%{$filter['value']}%";
                 }
                 if ($filter['key'] === 'd' || $filter['key'] === 'transfer_enable') {
                     $filter['value'] = $filter['value'] * 1073741824;
                 }
-                if ($filter['condition'] === '模糊') {
-                    $filter['condition'] = 'like';
-                    $filter['value'] = "%{$filter['value']}%";
+                if ($filter['key'] === 'invite_by_email') {
+                    $user = User::where('email', $filter['value'])->first();
+                    $inviteUserId = isset($user->id) ? $user->id : 0;
+                    $builder->where('invite_user_id', $inviteUserId);
                 }
                 $builder->where($filter['key'], $filter['condition'], $filter['value']);
             }

File diff suppressed because it is too large
+ 0 - 0
public/assets/admin/umi.js


File diff suppressed because it is too large
+ 0 - 0
public/theme/v2board/assets/umi.js


Some files were not shown because too many files changed in this diff