commit

app/admin/controller/user/User.php

@@ -7,6 +7,7 @@
 
 namespace app\admin\controller\user;
 
+use app\admin\model\auction\AuctionGu;
 use app\admin\controller\AuthController;
 use crmeb\repositories\UserRepository;
 use crmeb\traits\CurdControllerTrait;
@@ -36,9 +37,11 @@ class User extends AuthController
     public function index()
     {
         $level = SystemUserLevel::where('is_del', 0)->where('is_show', 1)->order('grade asc')->field(['id', 'name'])->select();
+        $hg = AuctionGu::select();
         $group = UserGroup::select();
         $this->assign(compact('group'));
         $this->assign(compact('level'));
+        $this->assign(compact('hg'));
         $this->assign('count_user', UserModel::getcount());
         return $this->fetch();
     }
@@ -345,6 +348,7 @@ class User extends AuthController
             ['level', ''],
             ['group_id', ''],
             ['excel', 0],
+            ['hg_id', 0],
         ]);
         return Json::successlayui(UserModel::getUserList($where));
     }

app/admin/model/user/User.php

@@ -101,6 +101,13 @@ class User extends BaseModel
         } else {
             $model = self::order('u.uid desc');
         }
+        if ($where['hg_id']){
+            $gu = AuctionGu::where('id', $where['hg_id'])->find();
+            $uids = get_downline(self::select(), $gu['uid']);
+            $uids = array_merge($uids, [$gu['uid']]);
+            $model = $model->where('u.uid', 'in', $uids);
+        }
+
         if ($where['user_time_type'] == 'visitno' && $where['user_time'] != '') {
             list($startTime, $endTime) = explode(' - ', $where['user_time']);
             $endTime = strtotime($endTime) + 24 * 3600;

app/admin/view/user/user/index.php

@@ -126,6 +126,18 @@
                                 </select>
                             </div>
                         </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label">会馆：</label>
+                            <div class="layui-input-inline">
+                                <select id="hg" name="hg_id" lay-verify="hg" lay-filter='hg'>
+                                    <option value="">全部</option>
+                                    {foreach ($hg as $item)}
+                                    <option value="{$item['id']}">{$item['name']}</option>
+                                    {/foreach}
+
+                                </select>
+                            </div>
+                        </div>
                         <div class="layui-inline">
                             <label class="layui-form-label">国　　家：</label>
                             <div class="layui-input-inline">