上级搜索

application/admin/controller/user/User.php

@@ -61,31 +61,11 @@ class User extends Backend
             return $this->selectpage();
         }
 
-        list(, $sort, $order, $offset, $limit) = $this->buildparams();
+        [$where, $sort, $order, $offset, $limit] = $this->buildparams();
         
-        //搜索条件 
-        $where = [];
-        $filter = json_decode(urldecode(input('filter')), TRUE);
-        list($where, $pid, $algebra) = $this->_where($filter);
-        
-        $list = $this->model
-            ->with('ledgerWallet')
-            ->alias('a');
-
-        if ($pid > 0) {//上级大于0的时候，默认搜索伞下
-            if($algebra > 0){
-                $list = $list->where('a.id', 'in', function ($query) use($pid, $algebra) {
-                    $query->table('user_path')->where('parent_id', $pid)->where('distance', $algebra)->field('user_id');
-
-                });
-            }else{
-                $list = $list->where('a.id', 'in', function ($query) use($pid, $algebra) {
-                    $query->table('user_path')->where('parent_id', $pid)->field('user_id');
-
-                });
-            }
-        }
-        $list = $list->where($where)->order($sort, $order)->paginate($limit);
+   
+  
+        $list = $this->model->with('ledgerWallet')->where($where)->order($sort, $order)->paginate($limit);
         $result = ['total' => $list->total(), 'rows' => $list->items()];
         return json($result);
     }
@@ -163,7 +143,7 @@ class User extends Backend
 
         if (isset($filter['id'])) $map['a.id'] = ['=', $filter['id']];
         if (isset($filter['address'])) $map['a.address'] = ['like', $filter['address']];
-        //if (isset($filter['parent_id']) &&  !isset($filter['algebra'])) $map['a.parent_id'] = ['=', $filter['parent_id']];
+        if (isset($filter['parent_id'])) $map['parent_id'] = ['=', $filter['parent_id']];
         if (isset($filter['create_time'])) {
             $arr = explode(' - ', $filter['create_time']);
             $map['a.create_time']= ['between time',[$arr[0], $arr[1]]];

public/assets/js/backend/user/user.js

@@ -29,7 +29,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
                         {field: 'address', title: __('Address'), operate: 'LIKE'},
-                        {field: 'parent_id', title: __('Parent_id')},
+                        {field: 'parent_id', title: __('Parent_id'), operate: 'LIKE'},
                         {field: 'nickname', title: __('Nickname'), operate: 'LIKE'},
                         {field: 'avatar', title: __('Avatar'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
@@ -37,7 +37,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             field: 'team_level_id', title: '团队等级', searchList: {
                                 '0': '金矿',
                                 '1': '股东',
-                            }, operate: 'FIND_IN_SET', formatter: Table.api.formatter.label
+                            }, operate: false, formatter: Table.api.formatter.label
                         },
                         {field: 'ledger_wallet.token', title: '茶宝', operate: false},
                         {field: 'ledger_wallet.teac', title: 'Teac', operate: false},