修改多层级bug

app/Http/Controllers/Admin/AdminUser.php

@@ -3,6 +3,8 @@
 use App\Http\Requests\Admin\AdminUser as Request;
 use App\Models\AdminUser as Model;
 use App\Models\AdminRule;
+use App\Models\Business;
+use App\Models\Company;
 use Illuminate\Support\Facades\DB;
 /**
  * 系统用户
@@ -77,6 +79,11 @@ class AdminUser extends Auth{
                 }
             }
             $value['rule_title']    =   $rule_title;
+            $value['business_name']         =   '';
+            if ($value['business_id']){
+                $value['business_name']      =  Business::query()->where('id', $value['business_id'])->value('name');
+            }
+            $value['company_name']      =   Company::query()->where('id', $value['company_id'])->value('name');
 			// 重组
 			$list[$key]			= $value;
 		}

app/Http/Controllers/Admin/AuthManager.php

@@ -1,6 +1,7 @@
 <?php namespace App\Http\Controllers\Admin;
 
 use App\Http\Requests\Admin\AuthManager as Request;
+use App\Models\Business;
 use Illuminate\Support\Facades\DB;
 
 /**
@@ -29,17 +30,28 @@ class AuthManager extends Auth{
         $mp                     =   [];
         $session                = session('userRule');
         if ($session){
-            $mp['company_id']	= $session['company_id'];
-            $mp['menu_type']    = $session['menu_type'];
+            $mp['auth_group.company_id']	= $session['company_id'];
+            $mp['auth_group.menu_type']    = $session['menu_type'];
             if ($session['business_id']){
-                $mp['business_id']       = $session['business_id'];
+                $mp['auth_group.business_id']       = $session['business_id'];
             }
         }
         if(!in_array(admin('uid'), explode(',', config('administrator')))){
-            $mp['type']       = 1;
+            $mp['auth_group.type']       = 1;
         }
   		// 查询列表数据
-     	$list = DB::table('auth_group')->where($mp)->select()->paginate(config('page_num',10))->appends(request()->all());
+     	$list = DB::table('auth_group')
+            ->join('company', 'company.id', '=', 'auth_group.company_id')
+            ->where($mp)
+            ->select('auth_group.*', 'company.name as company_name')
+            ->paginate(config('page_num',10))->appends(request()->all());
+        foreach($list as $k=>$v){
+            $v['business_name']         =   '';
+            if ($v['business_id']){
+                $v['business_name']      =  Business::query()->where('id', $v['business_id'])->value('name');
+            }
+            $list[$k] = $v;
+        }
 		// 分配数据
 		$this->assign('list',$list);
 		// 加载模板

app/Http/Controllers/Admin/Business.php

@@ -45,14 +45,16 @@ class Business extends Auth{
 		if( $startTime )		$map[] = ['business.insert_time','>=',Carbon::createFromFormat('Y-m-d',$startTime)->startOfDay()->getTimestamp()];
 		if( $startTime )		$map[] = ['business.insert_time','<=',Carbon::createFromFormat('Y-m-d',$startTime)->endOfDay()->getTimestamp()];
 		if( !is_null($status) )	$map[] = ['business.status','=',$status];
-        $session                = session('userRule');
-        if ($session){
-            $map[] = ['company_id','=',$session['company_id']];
-            if ($session['business_id']){
-                $map[] = ['business.id','=',$session['business_id']];
-            }
-            if ($session['menu_type'] == 1 && $session['data_type'] == 2){
-                $map[] = ['business.leader_uid','=',$session['admin_uid']];
+        if(!in_array(admin('uid'), explode(',', config('administrator')))){
+            $session				= session('userRule') ? session('userRule') : ['menu_type'=>0,'company_id'=>1,'business_id'=>0];
+            if ($session){
+                $map[] = ['company_id','=',$session['company_id']];
+                if ($session['business_id']){
+                    $map[] = ['business.id','=',$session['business_id']];
+                }
+                if ($session['menu_type'] == 1 && $session['data_type'] == 2){
+                    $map[] = ['business.leader_uid','=',$session['admin_uid']];
+                }
             }
         }
 		// 查询数据
@@ -112,6 +114,7 @@ class Business extends Auth{
 	 * 
 	 * */
 	public function add(Request $request,Model $Model,City $City,AdminUser $AdminUser,AdminRule $AdminRule){
+        $session				= session('userRule') ? session('userRule') : ['menu_type'=>0,'company_id'=>0,'business_id'=>0];
 		if( request()->isMethod('post') ){
 			// 验证参数
 			$request->scene('add')->validate();
@@ -129,7 +132,6 @@ class Business extends Auth{
 			$custom_name		    = request('custom_name','');
 			$phone		            = request('phone','');
 			$custom_password		= request('custom_password','');
-            $session                = session('userRule');
             if ($session['company_id']){
                 $data['company_id']	        = $session['company_id'];
                 $ruleData['company_id']     = $session['company_id'];
@@ -196,7 +198,6 @@ class Business extends Auth{
 		}
         // 获取列表
         $cityList					= $City->getCityList();
-        $session                    = session('userRule');
         $mp                         =   [];
         if ($session){
             $mp[]                   =   ['admin_rule.company_id','=',$session['company_id']];
@@ -276,7 +277,7 @@ class Business extends Auth{
         $oldData['city_ids']			= explode(',',$oldData['city_ids']);
         // 获取列表
         $cityList					= $City->getCityList();
-        $session                    = session('userRule');
+        $session				= session('userRule') ? session('userRule') : ['menu_type'=>0,'company_id'=>0,'business_id'=>0];
         $mp                         =   [];
         if ($session){
             $mp[]                   =   ['admin_rule.company_id','=',$session['company_id']];

resources/views/admin/admin_user/index.blade.php

@@ -22,6 +22,8 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 					<tr>
 						<th>序号</th>
 						<th>用户账号</th>
+						<th>商户名称</th>
+						<th>商业公司名称</th>
 						<th>用户角色</th>
 						<th>用户权限</th>
 						<th>创建时间</th>
@@ -34,6 +36,8 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<tr>
 							<th>{{$a['uid']}}</th>
 							<td>{{$a['username']}}</td>
+							<td>{{$a['company_name']}}</td>
+							<td>{{$a['business_name']}}</td>
 							<td>{{$a['rule_title']}}</td>
 							<td>{{$a['title']}}</td>
 							<td> {{date('Y/m/d H:i:s',$a['insert_time'])}}</td>

resources/views/admin/auth_manager/index.blade.php

@@ -14,7 +14,9 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 					<tr>											
 						<th>用户组</th> 	
 						<th>描述</th> 	
-						<th>授权</th> 	
+						<th>商户名称</th>
+						<th>商业公司名称</th>
+						<th>授权</th>
 						<th>操作</th>	
 					</tr>
 				</thead>
@@ -23,6 +25,8 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<tr>
 							<td>{{$a['title']}}</td>
 							<td>{{$a['description']}}</td>
+							<td>{{$a['company_name']}}</td>
+							<td>{{$a['business_name']}}</td>
 							<td>
 								<a href="{{url('admin/auth_manager/access?'.http_build_query(['id'=>$a['id']]))}}">访问授权</a>
 							</td>