1

app/Http/Controllers/Admin/Base/PhotosController.php

@@ -32,12 +32,10 @@ class PhotosController extends Controller
                 $a_class = ClassModel::first();
             }
         } else {
-            $a_class['store_id'] = $this->getStoreId();
             if (($a_class = ClassModel::find($a_class)) == null) {
                 $a_class = ClassModel::where('store_id', $this->getStoreId())->first();
             }
         }
-
         $photos = null;
         $status = 'normal';
         if ($request->has('search')) {
@@ -55,6 +53,7 @@ class PhotosController extends Controller
                     $photos = BaseAttachmentModel::where([['class', $a_class->class]])->paginate(24);
                 } else {
                     $photos = BaseAttachmentModel::where([['class', $a_class->class],['store_id', $this->getStoreId()]])->paginate(24);
+
                 }
             }
         }

app/Http/Controllers/Admin/Base/UserController.php

@@ -108,7 +108,10 @@ class UserController extends Controller
     {
         if(Request::method() == 'POST'){
             $data = Request::input('info');
-           // $data['store_id'] = $this->getStoreId();
+            if ($this->_user['is_root'] != 1) {
+                $data['store_id'] = $this->getStoreId();
+            }
+
             if(isset($data['admin_role_id']))$data['admin_role_id'] = implode(',', $data['admin_role_id']);
             if($this->_service->create($data)){
                 $this->showMessage('操作成功', urldecode(Request::input('_referer')));
@@ -117,8 +120,8 @@ class UserController extends Controller
             }
         }
         $data = $this->_service->find(Request::input('id'));
-
-        if($this->_user['is_root']){
+        $data['is_root'] = $this->_user['is_root'];
+        if($this->_user['is_root']) {
             $roles = $this->_getRoles();
         }else{
             $roles = $this->_getCurrentRoles();
@@ -138,6 +141,9 @@ class UserController extends Controller
             if ($data['password'] == null) {
                 unset($data['password']);
             }
+            if ($this->_user['is_root'] != 1) {
+                $data['store_id'] = $this->getStoreId();
+            }
           //  dd($data);
             if(isset($data['admin_role_id']))$data['admin_role_id'] = implode(',', $data['admin_role_id']);
             if($this->_service->update(Request::input('id'), $data)){
@@ -147,7 +153,7 @@ class UserController extends Controller
             }
         }
         $data = $this->_service->find(Request::input('id'));
-        
+        $data['is_root'] = $this->_user['is_root'];
         if($this->_user['is_root']){
             $roles = $this->_getRoles();
         }else{

resources/views/admin/base/user/edit.blade.php

@@ -52,20 +52,22 @@
 
                                 </div>
 
+                                @if($data['is_root'] == 1)
+                                    <div class="form-group">
 
-                                <div class="form-group">
+                                        <label class="control-label col-sm-3">选择商户 </label>
 
-                                    <label class="control-label col-sm-3">选择商户 </label>
+                                        <div class="col-sm-6">
+                                            <input id="data_store" class="form-control" v-model="checkstore.name"   readonly placeholder="">
+                                            <input id="data_store_id" type="hidden" name="info[store_id]" v-model="checkstore.id"  required="" aria-required="true"  placeholder="">
+                                        </div>
 
-                                    <div class="col-sm-6">
-                                        <input id="data_store" class="form-control" v-model="checkstore.name"   readonly placeholder="">
-                                        <input id="data_store_id" type="hidden" name="info[store_id]" v-model="checkstore.id"  required="" aria-required="true"  placeholder="">
+                                        <div class="col-sm-3">
+                                            <button type="button" class="btn btn-w-m btn-primary" data-toggle="modal" data-target="#myModal5" onclick="SearchStore()" @if(!empty($data['mobile'])) disabled="disabled" @endif>选择</button>
+                                        </div>
                                     </div>
+                                @endif
 
-                                    <div class="col-sm-3">
-                                        <button type="button" class="btn btn-w-m btn-primary" data-toggle="modal" data-target="#myModal5" onclick="SearchStore()" @if(!empty($data['mobile'])) disabled="disabled" @endif>选择</button>
-                                    </div>
-                                </div>
                                 <div class="form-group">
                                     <label class="control-label col-sm-3">密码</label>
                                     <div class="col-sm-9">