去掉is_behind

app/Http/Middleware/CheckLogin.php

@@ -64,10 +64,8 @@ class CheckLogin
         $data['is_all_depart'] = $return[4] ?? 0;
         //总公司
         $data['head'] = $return[5] ?? [];
-        //是否是总公司下的人
-        $data['is_behind_main'] = $return[6] ?? 0;
         //当前部门
-        $data['depart_select'] = $return[7] ?? [];
+        $data['depart_select'] = $return[6] ?? [];
         //是否库存校验(默认校验)
         $my_top = $data['depart_top'][0] ?? [];
         $is_check_stock = empty($my_top['is_stock']) ? ProductInventorySet::type_one : $my_top['is_stock'];

app/Http/Middleware/CheckWx.php

@@ -83,10 +83,8 @@ class CheckWx
             $data['is_all_depart'] = $return[4] ?? 0;
             //总公司
             $data['head'] = $return[5] ?? [];
-            //是否是总公司下的人
-            $data['is_behind_main'] = $return[6] ?? 0;
             //当前部门
-            $data['depart_select'] = $return[7] ?? [];
+            $data['depart_select'] = $return[6] ?? [];
             //是否库存校验(默认校验)
             $my_top = $data['depart_top'][0] ?? [];
             $is_check_stock = empty($my_top['is_stock']) ? ProductInventorySet::type_one : $my_top['is_stock'];

app/Service/EmployeeService.php

@@ -1104,13 +1104,6 @@ class EmployeeService extends Service
         if($res['is_admin'] != Employee::IS_ADMIN) return [false,'该账号不能登录！'];
         if($res['state'] == Employee::NOT_USE) return [false,'账号停用！'];
 
-        //门店的信息（即将废弃）
-//        $return = EmployeeService::getLoginDepartfq($res['id']);
-//        $is_main = $return[4] ?? 0;
-//        $depart_top = $return[1] ?? [];
-//        $depart_top_title = $depart_top[0]['title'] ?? "";
-//        $depart_top_id = $depart_top[0]['depart_id'] ?? 0;
-
         //门店的信息
         $login_message = EmployeeService::getLoginMessage($res['id']);
 
@@ -1343,7 +1336,7 @@ class EmployeeService extends Service
         $top = $map = $rule = $head = [];
         $res_data = [];//获取当前所在部门(也可能是门店 为了 depart_id)
         $my_depart = [];//当前门店下 我勾选的门店以及部门信息
-        $is_all_depart = $is_behind_main = 0;
+        $is_all_depart = 0;
         if(! empty($depart)){
             //库存校验
             $set_map = ProductInventorySet::where('del_time',0)->pluck('param_one','top_depart_id')->toArray();
@@ -1364,7 +1357,6 @@ class EmployeeService extends Service
                         'is_stock' => $is_stock,
                     ];
                     $map[$value['depart_id']] = $value['depart_id'];
-                    if(! empty($value['is_main']) && ! $is_behind_main) $is_behind_main = 1;
 
                     if($value['depart_id'] == $top_depart_id) {
                         $my_depart[] = $depart[$key];
@@ -1390,7 +1382,6 @@ class EmployeeService extends Service
                             ];
                         }
                         $map[$value['depart_id']] = $t;
-                        if(! empty($t_tmp['is_main']) && ! $is_behind_main) $is_behind_main = 1;
                     }
                     if($t == $top_depart_id){
                         $my_depart[] = $depart[$key];
@@ -1463,7 +1454,7 @@ class EmployeeService extends Service
 
         $rule = array_unique($rule);
 
-        return [$depart,$top,$map,$rule,$is_all_depart,$head,$is_behind_main,$res_data];
+        return [$depart,$top,$map,$rule,$is_all_depart,$head,$res_data];
     }
 
     //获取用户的所属门店信息
@@ -1525,99 +1516,6 @@ class EmployeeService extends Service
         return $top;
     }
 
-    public static function getLoginDepartfq($employee_id){
-        if(empty($employee_id)) return [];
-
-        //自己绑定的部门 启用的部门
-        $depart = EmployeeDepartPermission::from('employee_depart_permission as a')
-            ->join('depart as b','b.id','a.depart_id')
-            ->where('a.employee_id',$employee_id)
-            ->where('b.is_use',Depart::IS_UES)
-            ->select('a.depart_id','b.is_main','b.parent_id','b.basic_type_id','b.title')
-            ->orderBy('b.parent_id','asc')
-            ->orderBy('b.is_main','desc')
-            ->orderBy('a.depart_id','asc')
-            ->get()->toArray();
-
-        $top = $map = $rule = $head = [];
-        $is_all_depart = $is_behind_main = 0;
-        if(! empty($depart)){
-            //库存校验
-            $set_map = ProductInventorySet::where('del_time',0)->pluck('param_one','top_depart_id')->toArray();
-
-            //所有部门
-            $list = Depart::where('del_time',0)->get()->toArray();
-            $depart_map = array_column($list,null,'id');
-            foreach ($depart as $key => $value){
-                if($value['parent_id'] == 0){//顶级
-                    $is_stock = $set_map[$value['depart_id']] ?? 1;
-                    $depart[$key]['is_stock'] = $is_stock;
-                    $top[$value['depart_id']] = [
-                        'depart_id' => $value['depart_id'],
-                        'is_main' => $value['is_main'],
-                        'basic_type_id' => $value['basic_type_id'],
-                        'title' => $value['title'],
-                        'is_stock' => $is_stock,
-                    ];
-                    $map[$value['depart_id']] = $value['depart_id'];
-                    if(! empty($value['is_main']) && ! $is_all_depart) $is_all_depart = 1;
-                    if(! empty($value['is_main']) && ! $is_behind_main) $is_behind_main = 1;
-                }else{
-                    $t = self::getTopParentId($value['depart_id'],$list);
-                    if($t && isset($depart_map[$t])) {
-                        $is_stock = $set_map[$t] ?? 1;
-                        $depart[$key]['is_stock'] = $is_stock;
-                        $t_tmp = $depart_map[$t] ?? [];
-                        $top[$t_tmp['id']] = [
-                            'depart_id' => $t_tmp['id'],
-                            'is_main' => $t_tmp['is_main'],
-                            'basic_type_id' => $t_tmp['basic_type_id'],
-                            'title' => $t_tmp['title'],
-                            'is_stock' => $set_map[$t] ?? 1,
-                        ];
-                        $map[$value['depart_id']] = $t;
-                        if(! empty($t_tmp['is_main']) && $value['is_main'] && ! $is_all_depart) $is_all_depart = 1;
-                        if(! empty($t_tmp['is_main']) && ! $is_behind_main) $is_behind_main = 1;
-                    }
-                }
-            }
-            foreach ($depart as $value){
-                if(in_array($value['depart_id'],$rule)) continue;
-                if(! $value['parent_id']){ //顶级
-                    if($value['is_main']) {//是总公司
-                        //所有部门都有
-                        $rule = array_column($list,'id');
-                    }else{//不是总公司
-                        //自己以及子部门
-                        $depart_id = array_merge(self::getAllIds($list,$map[$value['depart_id']]),[$map[$value['depart_id']]]);
-                        $rule = array_merge_recursive($rule,$depart_id);
-                    }
-                }else{//非顶级
-                    if($value['is_main']) {//是总社
-                        $top_tmp = $map[$value['depart_id']];
-                        if(! empty($depart_map[$top_tmp]['is_main'])){
-                            //顶级公司是总公司 所有部门都有
-                            $rule = array_column($list,'id');
-                        }else{
-                            //顶级公司是分公司 分公司所有部门
-                            $depart_id = array_merge(self::getAllIds($list,$top_tmp),[$top_tmp]);
-                            $rule = array_merge_recursive($rule,$depart_id);
-                        }
-                    }else{//不是总社
-                        $rule = array_merge($rule,[$value['depart_id']]);
-                    }
-                }
-            }
-            foreach ($list as $value){
-                if(empty($value['parent_id']) && ! empty($value['is_main'])) $head = $value;
-            }
-        }
-        $top = array_values($top);
-        $rule = array_unique($rule);
-
-        return [$depart, $top, $map, $rule, $is_all_depart, $head, $is_behind_main];
-    }
-
     /**
      * 获取顶级id
      * @param $id