dyjh 6 年之前
父节点
当前提交
a68ec262b8
共有 2 个文件被更改,包括 12 次插入3 次删除
  1. 7 2
      app/Http/Controllers/Admin/Base/UserController.php
  2. 5 1
      app/Services/Admin/AdminUser.php

+ 7 - 2
app/Http/Controllers/Admin/Base/UserController.php

xqd xqd
@@ -43,7 +43,12 @@ class UserController extends Controller
         if(isset($request['sort_field']) && $request['sort_field'] && isset($request['sort_field_by'])) {
             $orderby[$request['sort_field']] = $request['sort_field_by'];
         }
-        $list = $this->_service->search($search, $orderby);
+        if ($this->_user->is_root == 1) {
+            $store_id = 0;
+        } else {
+            $store_id = $this->getStoreId();
+        }
+        $list = $this->_service->search($search, $orderby, $store_id);
         //dd($list);
         foreach ($list as $item) {
             $item->store = '暂无';
@@ -54,7 +59,7 @@ class UserController extends Controller
 
         }
         $roles = pairList($this->_getRoles(), 'id', 'name');
-        dd($roles);
+        dd($list);
         return view('admin.base.user.index', compact('list', 'roles'));
     }
 

+ 5 - 1
app/Services/Admin/AdminUser.php

xqd xqd
@@ -40,7 +40,7 @@ class AdminUser extends BaseProcess
      * @param $search
      * @param $pagesize
      */
-    public function search($search, $orderby = array(), $pagesize = PAGE_NUMS)
+    public function search($search, $orderby = array(), $store_id, $pagesize = PAGE_NUMS)
     {
         $currentQuery = $this->objModel;
         if(isset($search['keyword']) && !empty($search['keyword'])) {
@@ -51,6 +51,10 @@ class AdminUser extends BaseProcess
                     ->orwhere('mobile', 'like', $keywords);
             });
         }
+
+        if ($store_id != 0) {
+            $currentQuery = $currentQuery->where('store_id', $store_id);
+        }
         if(isset($search['resetPwd']) && $search['resetPwd']) {
 
             $currentQuery = $currentQuery->where('reset_password', '<>', '');