[智价云] 管理员查看公司信息隔离处理

app/Http/Controllers/Manager/AdminHistory.php

@@ -26,6 +26,7 @@ class AdminHistory extends Controller
     public function list(Request $request, AdminHistoryModel $AdminHistoryModel, AdminUserModel $AdminUserModel, EmployeeModel $EmployeeModel)
     {
         $request->scene('list')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 查询条件
@@ -44,6 +45,11 @@ class AdminHistory extends Controller
         if ($general_description) $map[] = ['general_description', 'like', "%$general_description%"];
         if ($notes_type) $map[] = ['notes_type', '=', $notes_type];
         // 查询数据
+        if ($is_admin != 1 && $company_id != 0){
+             $map[] = ['company_id', '=', $company_id];
+        }else{
+            $map[] = ['company_id', '=', $admin_company_id];
+        }
         $result = $AdminHistoryModel
             ->where($map)
             ->select(['id', 'admin_uid', 'is_admin', 'module_menu_name', 'notes_type', 'general_description', 'insert_time'])

app/Http/Controllers/Manager/Collect/Product.php

@@ -26,6 +26,7 @@ class Product extends Controller
     public function list(Request $request, ProductModel $ProductModel)
     {
         $request->scene('list')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');
         // 查询条件
@@ -44,7 +45,11 @@ class Product extends Controller
         if ($product_name) $map[] = ['product_name', 'like', "%$product_name%"];
         if (is_numeric($platform) || $platform) $map[] = ['platform', 'like', "%$platform%"];
         // 权限判断
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0){
+             $map[] = ['company_id', '=', $company_id];
+        }else{
+            $map[] = ['company_id', '=', $admin_company_id];
+        }
         // 查询数据
         $result = $ProductModel->query()
             ->where($map)
@@ -70,13 +75,18 @@ class Product extends Controller
     public function detail(Request $request, ProductModel $ProductModel)
     {
         $request->scene('detail')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');
         // 接收参数
         $id = request('id', 0);
         $map = ['id' => $id];
         // 权限判断
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $ProductModel->where($map)->first();
         if (!$data)     return json_send(['code' => 'error', 'msg' => '记录不存在']);
 
@@ -95,6 +105,7 @@ class Product extends Controller
     public function add(Request $request, ProductModel $ProductModel)
     {
         $request->scene('add')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         //商品启用数量
@@ -118,7 +129,11 @@ class Product extends Controller
         if ($all_data['sampling_start_time']  && $all_data['sampling_start_time'] < $allow_sampling_time) return json_send(['code' => 'error', 'msg' => '采集最早开始时间为明天']);
         //查询是否存在
         $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'], 'platform' => $all_data['platform']];
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $ProductModel->where($map)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 写入数据表
@@ -145,6 +160,7 @@ class Product extends Controller
     public function edit(Request $request, ProductModel $ProductModel)
     {
         $request->scene('edit')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收参数
@@ -162,12 +178,21 @@ class Product extends Controller
         $all_data['minimum_order_quantity'] = $minimum_order_quantity;
         //查询是否存在
         $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'], 'platform' => $all_data['platform']];
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $ProductModel->where($map)->where('id', '!=', $id)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 更新数据表
         $where = ['id' => $id];
-        if ($is_admin != 1 && $company_id != 0) $where[] = ['company_id', '=', $company_id];
+        // 权限判断
+        if ($is_admin != 1 && $company_id != 0){
+             $where['company_id'] = $company_id;
+        }else{
+            $where['company_id'] = $admin_company_id;
+        }
         $Product = $ProductModel->where($where)->first();
         if (!$Product) return json_send(['code' => 'error', 'msg' => '记录不存在']);
         $oldData = $Product->toarray();
@@ -196,6 +221,7 @@ class Product extends Controller
     {
         // 验证参数
         $request->scene('set_status')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收数据
@@ -211,7 +237,11 @@ class Product extends Controller
         }
         // 查询用户
         $where = ['id' => $id];
-        if ($is_admin != 1 && $company_id != 0) $where[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0){
+             $where['company_id'] = $company_id;
+        }else{
+            $where['company_id'] = $admin_company_id;
+        }
         $Product = $ProductModel->where($where)->first();
         if (!$Product) return json_send(['code' => 'error', 'msg' => '记录不存在']);
         // 执行修改
@@ -239,13 +269,18 @@ class Product extends Controller
     {
         // 验证参数
         $request->scene('delete')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收数据
         $id = request('id', 0);
         // 查询用户
         $where = ['id' => $id];
-        if ($is_admin != 1 && $company_id != 0) $where[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0){
+             $where['company_id'] = $company_id;
+        }else{
+            $where['company_id'] = $admin_company_id;
+        }
         // 执行删除
         $Product = $ProductModel->where($where)->first();
         if (!$Product) {

app/Http/Controllers/Manager/Personnel/Department.php

@@ -26,6 +26,7 @@ class Department extends Controller
     public function list(Request $request, DepartmentModel $DepartmentModel)
     {
         $request->scene('list')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');
         // 查询条件
@@ -35,14 +36,18 @@ class Department extends Controller
         $start_time = request('start_time', '');
         $end_time = request('end_time', '');
         $name = request('name', '');
-        // 权限判断
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
         // 时间条件
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
         // 其他条件
         if (is_numeric($status)) $map[] = ['status', '=', $status];
         if ($name) $map[] = ['name', 'like', "%$name%"];
+        // 权限判断
+        if ($is_admin != 1 && $company_id != 0) {
+            $map[] = ['company_id', '=', $company_id];
+        } else {
+            $map[] = ['company_id', '=', $admin_company_id];
+        }
         // 查询数据
         $result = $DepartmentModel->query()
             ->where($map)
@@ -64,6 +69,7 @@ class Department extends Controller
     public function all(DepartmentModel $DepartmentModel)
     {
         $map  = [];
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');
         $status    = request('status', '0');
@@ -71,7 +77,11 @@ class Department extends Controller
         $end_time = request('end_time', '');
         $name = request('name', '');
         // 权限判断
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $map[] = ['company_id', '=', $company_id];
+        } else {
+            $map[] = ['company_id', '=', $admin_company_id];
+        }
         // 时间条件
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
@@ -97,13 +107,18 @@ class Department extends Controller
     public function detail(Request $request, DepartmentModel $DepartmentModel)
     {
         $request->scene('detail')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');
         // 接收参数
         $id = request('id', 0);
-        // 权限判断
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
         $map = ['id' => $id];
+        // 权限判断
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $DepartmentModel->where($map)->first();
         if (!$data)     return json_send(['code' => 'error', 'msg' => '记录不存在']);
         // 加载模板
@@ -120,19 +135,25 @@ class Department extends Controller
     public function add(Request $request, DepartmentModel $DepartmentModel)
     {
         $request->scene('add')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $all_data = request()->all();
         $store_scope = request('store_scope', '');
         $all_data['store_scope'] = $store_scope;
         //查询是否存在
         $map = ['name' => $all_data['name']];
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
-        $all_data['company_id'] = $company_id;
+        // 权限判断
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $DepartmentModel->where($map)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 写入数据表
+        $all_data['company_id'] = $company_id;
         $result     =  $DepartmentModel->addDepartment($all_data);
         // 如果操作失败
         if (!$result)     return json_send(['code' => 'error', 'msg' => '新增失败']);
@@ -141,7 +162,7 @@ class Department extends Controller
         $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $DepartmentModel->getTable();
         $notes_type = 1; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('人员信息管理-部门管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, [], $all_data, '新增了部门' . $all_data['name'] . '信息');
+        $this->addAdminHistory('人员信息管理-部门管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, [], $all_data, '新增了部门' . $all_data['name'] . '信息');
         // 告知结果
         return json_send(['code' => 'success', 'msg' => '新增成功']);
     }
@@ -156,8 +177,9 @@ class Department extends Controller
     public function edit(Request $request, DepartmentModel $DepartmentModel)
     {
         $request->scene('edit')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收参数
         $id         = request('id', 0);
         // 接收数据
@@ -166,13 +188,22 @@ class Department extends Controller
         $all_data['store_scope'] = $store_scope;
         $where = ['id' => $id];
         // 权限判断
-        if ($is_admin != 1 && $company_id != 0) $where[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $where['company_id'] = $company_id;
+        } else {
+            $where['company_id'] = $admin_company_id;
+        }
         $Department = $DepartmentModel->where($where)->first();
         if (!$Department) return json_send(['code' => 'error', 'msg' => '记录不存在']);
         $oldData = $Department->toArray();
         //查询是否存在
         $map = ['name' => $all_data['name']];
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
+        // 权限判断
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $DepartmentModel->where($map)->where('id', '!=', $id)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 更新数据表
@@ -183,7 +214,7 @@ class Department extends Controller
         $admin_id   = request('access_token.uid', 0); //用户ID
         $table_name = $DepartmentModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('人员信息管理-部门管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, $oldData, $all_data, '修改了部门' . $oldData['name'] . '信息');
+        $this->addAdminHistory('人员信息管理-部门管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, $oldData, $all_data, '修改了部门' . $oldData['name'] . '信息');
         // 告知结果
         return json_send(['code' => 'success', 'msg' => '修改成功']);
     }
@@ -199,22 +230,32 @@ class Department extends Controller
     {
         // 验证参数
         $request->scene('set_status')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $id                = request('id', 0);
         $status            = request('status', 0);
         // 查询用户
         $where = ['id' => $id];
         // 权限判断
-        if ($is_admin != 1 && $company_id != 0) $where[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $where['company_id'] = $company_id;
+        } else {
+            $where['company_id'] = $admin_company_id;
+        }
         // 执行修改
         $Department = $DepartmentModel->where($where)->first();
         if (!$Department) return json_send(['code' => 'error', 'msg' => '记录不存在']);
         if ($status == 1) {
             // 查询部门下是否有员工
             $map = ['department_id' => $id];
-            if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
+            // 权限判断
+            if ($is_admin != 1 && $company_id != 0) {
+                $map['company_id'] = $company_id;
+            } else {
+                $map['company_id'] = $admin_company_id;
+            }
             $data = $EmployeeDepartmentModel->where($map)->first();
             if ($data)     return json_send(['code' => 'error', 'msg' => '该部门下存在员工，不能禁用']);
         }
@@ -228,7 +269,7 @@ class Department extends Controller
         $admin_id   = request('access_token.uid', 0); //用户ID
         $table_name = $DepartmentModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('人员信息管理-部门管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, [], ['status' => $status], '修改了部门' . $Department->name . '状态');
+        $this->addAdminHistory('人员信息管理-部门管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, [], ['status' => $status], '修改了部门' . $Department->name . '状态');
         // 告知结果
         return             json_send(['code' => 'success', 'msg' => '设置成功']);
     }
@@ -245,13 +286,18 @@ class Department extends Controller
     {
         // 验证参数
         $request->scene('delete')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $id = request('id', 0);
         // 查询用户
         $where = ['id' => $id];
-        if ($is_admin != 1 && $company_id != 0) $where[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $where['company_id'] = $company_id;
+        } else {
+            $where['company_id'] = $admin_company_id;
+        }
         $Department = $DepartmentModel->where($where)->first();
         if (!$Department) {
             return json_send(['code' => 'error', 'msg' => '记录不存在']);
@@ -259,7 +305,11 @@ class Department extends Controller
         // 查询部门下是否有员工
         $map = ['department_id' => $id];
         // 权限判断
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $EmployeeDepartmentModel->where($map)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '该部门下存在员工，不能删除']);
         $result = $Department->delete();
@@ -269,7 +319,7 @@ class Department extends Controller
         $admin_id   = request('access_token.uid', 0); //用户ID
         $table_name = $DepartmentModel->getTable();
         $notes_type = 3; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('人员信息管理-部门管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, $Department->toArray(), [], '删除了部门' . $Department->name . '信息');
+        $this->addAdminHistory('人员信息管理-部门管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, $Department->toArray(), [], '删除了部门' . $Department->name . '信息');
         // 告知结果
         return             json_send(['code' => 'success', 'msg' => '删除成功']);
     }

app/Http/Controllers/Manager/Personnel/Employee.php

@@ -29,6 +29,7 @@ class Employee extends Controller
     public function list(Request $request, EmployeeModel $EmployeeModel, DepartmentModel $DepartmentModel, RolesModel $RolesModel, CitysModel $CitysModel, EmployeeAreaModel $EmployeeAreaModel, EmployeeDepartmentModel $EmployeeDepartmentModel)
     {
         $request->scene('list')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');
         // 查询条件
@@ -60,14 +61,22 @@ class Employee extends Controller
         if ($city_id) $map[] = ['city_ids', 'like', "%,$city_id,%"];
         if ($role_name) {
             $role_where = [['name', 'like', "%$role_name%"]];
-            if ($is_admin != 1 && $company_id != 0) $role_where[] = ['company_id', '=', $company_id];
+            if ($is_admin != 1 && $company_id != 0) {
+                $role_where[] = ['company_id', '=', $company_id];
+            } else {
+                $role_where[] = ['company_id', '=', $admin_company_id];
+            }
             $role_ids = $RolesModel->where($role_where)->pluck('id')->toarray();
         }
         $field = ['id', 'employee_code', 'name', 'mobile', 'department_ids', 'role_id', 'city_ids', 'open_notice', 'insert_time', 'update_time', 'status'];
         // 查询数据
         if (count($role_ids) > 0) {
             $employee_where = [];
-            if ($is_admin != 1 && $company_id != 0) $employee_where[] = ['company_id', '=', $company_id];
+            if ($is_admin != 1 && $company_id != 0) {
+                $employee_where[] = ['company_id', '=', $company_id];
+            } else {
+                $employee_where[] = ['company_id', '=', $admin_company_id];
+            }
             $EmployeeModel = $EmployeeModel->whereIn('role_id', $role_ids)->where($employee_where);
         }
         //多选查询地区
@@ -82,13 +91,21 @@ class Employee extends Controller
         if ($department_ids && is_string($department_ids)) {
             $department_ids =  explode(',', $department_ids);
             $employee_department_where = [];
-            if ($is_admin != 1 && $company_id != 0) $employee_department_where[] = ['company_id', '=', $company_id];
+            if ($is_admin != 1 && $company_id != 0) {
+                $employee_department_where[] = ['company_id', '=', $company_id];
+            } else {
+                $employee_department_where[] = ['company_id', '=', $admin_company_id];
+            }
             $subQuery = $EmployeeDepartmentModel->whereIn('department_id', $department_ids)->where($employee_department_where)->distinct('employee_id')->select('employee_id');
             $EmployeeModel = $EmployeeModel->whereIn('id', function ($query1) use ($subQuery) {
                 $query1->select('employee_id')->fromSub($subQuery, 'sub1');
             });
         }
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $map[] = ['company_id', '=', $company_id];
+        } else {
+            $map[] = ['company_id', '=', $admin_company_id];
+        }
         $result = $EmployeeModel
             ->where($map)
             ->select($field)
@@ -101,8 +118,14 @@ class Employee extends Controller
                 //查询部门信息
                 $department_ids = $value['department_ids'] != '' ? explode(',', $value['department_ids']) : '';
                 $department_name = $department_ids ? $DepartmentModel->whereIn('id', $department_ids)->pluck('name')->toarray() : '';
+                $role_where =['id' => $value['role_id']];
+                if ($is_admin != 1 && $company_id != 0) {
+                    $role_where['company_id'] = $company_id;
+                } else {
+                    $role_where['company_id'] = $admin_company_id;
+                }
                 //查询角色信息
-                $role_info = $RolesModel->where(['id' => $value['role_id']])->first();
+                $role_info = $RolesModel->where($role_where)->first();
                 //查询城市信息
                 $city_ids = explode(',', $value['city_ids']);
                 $city_info = [];
@@ -129,6 +152,7 @@ class Employee extends Controller
     public function all(Request $request, EmployeeModel $EmployeeModel, RolesModel $RolesModel, EmployeeAreaModel $EmployeeAreaModel, EmployeeDepartmentModel $EmployeeDepartmentModel)
     {
         $request->scene('all')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');
         // 查询条件
@@ -160,15 +184,23 @@ class Employee extends Controller
         if ($city_id) $map[] = ['city_ids', 'like', "%,$city_id,%"];
         // 权限判断
         if ($role_name) {
-             $role_where = [['name', 'like', "%$role_name%"]];
-            if ($is_admin != 1 && $company_id != 0) $role_where[] = ['company_id', '=', $company_id];
+            $role_where = [['name', 'like', "%$role_name%"]];
+            if ($is_admin != 1 && $company_id != 0) {
+                $role_where[] = ['company_id', '=', $company_id];
+            } else {
+                $role_where[] = ['company_id', '=', $admin_company_id];
+            }
             $role_ids = $RolesModel->where($role_where)->pluck('id')->toarray();
         }
         $field = ['id', 'name'];
         // 查询数据
         if (count($role_ids) > 0) {
-             $employee_where = [];
-            if ($is_admin != 1 && $company_id != 0) $employee_where[] = ['company_id', '=', $company_id];
+            $employee_where = [];
+            if ($is_admin != 1 && $company_id != 0) {
+                $employee_where[] = ['company_id', '=', $company_id];
+            } else {
+                $employee_where[] = ['company_id', '=', $admin_company_id];
+            }
             $EmployeeModel = $EmployeeModel->whereIn('role_id', $role_ids)->where($employee_where);
         }
         //多选查询地区
@@ -183,13 +215,21 @@ class Employee extends Controller
         if ($department_ids && is_string($department_ids)) {
             $department_ids =  explode(',', $department_ids);
             $employee_department_where = [];
-            if ($is_admin != 1 && $company_id != 0) $employee_department_where[] = ['company_id', '=', $company_id];
+            if ($is_admin != 1 && $company_id != 0) {
+                $employee_department_where[] = ['company_id', '=', $company_id];
+            } else {
+                $employee_department_where[] = ['company_id', '=', $admin_company_id];
+            }
             $subQuery = $EmployeeDepartmentModel->whereIn('department_id', $department_ids)->where($employee_department_where)->distinct('employee_id')->select('employee_id');
             $EmployeeModel = $EmployeeModel->whereIn('id', function ($query1) use ($subQuery) {
                 $query1->select('employee_id')->fromSub($subQuery, 'sub1');
             });
         }
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $map[] = ['company_id', '=', $company_id];
+        } else {
+            $map[] = ['company_id', '=', $admin_company_id];
+        }
         $result = $EmployeeModel
             ->where($map)
             ->select($field)
@@ -210,21 +250,33 @@ class Employee extends Controller
     public function detail(Request $request, EmployeeModel $EmployeeModel, DepartmentModel $DepartmentModel, RolesModel $RolesModel, CitysModel $CitysModel)
     {
         $request->scene('detail')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收参数
         $id = request('id', 0);
         $map = ['id' => $id];
-        // 权限判断
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
         $field = ['id', 'employee_code', 'name', 'mobile', 'department_ids', 'duty_type', 'role_id', 'city_ids', 'open_notice', 'insert_time', 'update_time', 'status'];
+        // 权限判断
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $EmployeeModel->where($map)->select($field)->first();
         if (!$data)     return json_send(['code' => 'error', 'msg' => '记录不存在']);
         // 查询部门信息
         $department_ids = explode(',', $data['department_ids']);
         $department_info = $DepartmentModel->whereIn('id', $department_ids)->select(['id', 'name'])->get()->toarray();
         // 查询角色信息
-        $role_info = $RolesModel->where(['id' => $data['role_id']])->first();
+        $role_where = ['id' => $data['role_id']];
+        // 权限判断
+        if ($is_admin != 1 && $company_id != 0) {
+            $role_where['company_id'] = $company_id;
+        } else {
+            $role_where['company_id'] = $admin_company_id;
+        }
+        $role_info = $RolesModel->where($role_where)->first();
         // 查询城市信息
         $city_ids = explode(',', $data['city_ids']);
         $city_info = [];
@@ -250,8 +302,9 @@ class Employee extends Controller
     public function add(Request $request, EmployeeModel $EmployeeModel)
     {
         $request->scene('add')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $all_data = request()->all();
         $user_company_id = request('access_token.company_id', '0');
@@ -263,15 +316,23 @@ class Employee extends Controller
         $all_data['department_ids'] = $department_ids;
         $city_ids =  request('city_ids', '');
         $all_data['city_ids'] = $city_ids;
-        // 权限判断
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
-        $all_data['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $EmployeeModel->where($map)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '员工姓名记录已存在']);
         $map = ['mobile' => $all_data['mobile']];
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $EmployeeModel->where($map)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '员工手机号记录已存在']);
         // 写入数据表
+        $all_data['company_id'] = $company_id;
         $result     =  $EmployeeModel->addEmployee($all_data);
         // 如果操作失败
         if (!$result)     return json_send(['code' => 'error', 'msg' => '新增失败']);
@@ -279,7 +340,7 @@ class Employee extends Controller
         $admin_id   = request('access_token.uid', 0); //用户ID
         $table_name = $EmployeeModel->getTable();
         $notes_type = 1; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('人员信息管理-员工管理',$user_company_id, $admin_id, $is_admin, $table_name, $notes_type, [], $all_data, '新增了员工' . $all_data['name'] . '信息');
+        $this->addAdminHistory('人员信息管理-员工管理', $user_company_id, $admin_id, $is_admin, $table_name, $notes_type, [], $all_data, '新增了员工' . $all_data['name'] . '信息');
         // 告知结果
         return json_send(['code' => 'success', 'msg' => '新增成功']);
     }
@@ -294,8 +355,9 @@ class Employee extends Controller
     public function edit(Request $request, EmployeeModel $EmployeeModel)
     {
         $request->scene('edit')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收参数
         $id         = request('id', 0);
         // 接收数据
@@ -309,20 +371,34 @@ class Employee extends Controller
         $all_data['password'] = request('password', '');
         $where = ['id' => $id];
         // 权限判断
-        if ($is_admin != 1 && $company_id != 0) $where[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $where['company_id'] = $company_id;
+        } else {
+            $where['company_id'] = $admin_company_id;
+        }
         $Employee = $EmployeeModel->where($where)->first();
         if (!$Employee) return json_send(['code' => 'error', 'msg' => '记录不存在']);
         $oldData = $Employee->toArray();
         //查询是否存在
         $map = ['name' => $all_data['name']];
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
+        // 权限判断
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $EmployeeModel->where($map)->where('id', '!=', $id)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '员工姓名记录已存在']);
         $map = ['mobile' => $all_data['mobile']];
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $EmployeeModel->where($map)->where('id', '!=', $id)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '员工手机号记录已存在']);
         // 更新数据表
+        $all_data['company_id'] = $company_id;
         $result =  $EmployeeModel->updateEmployee($Employee, $all_data);
         // 如果操作失败
         if (!$result)     return json_send(['code' => 'error', 'msg' => '修改失败']);
@@ -346,8 +422,9 @@ class Employee extends Controller
     {
         // 验证参数
         $request->scene('set_status')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $id                = request('id', 0);
         $status            = request('status', 0);
@@ -355,7 +432,11 @@ class Employee extends Controller
         // 查询用户
         $where = ['id' => $id];
         // 权限判断
-        if ($is_admin != 1 && $company_id != 0) $where[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $where['company_id'] = $company_id;
+        } else {
+            $where['company_id'] = $admin_company_id;
+        }
         // 执行修改
         $Employee = $EmployeeModel->where($where)->first();
         if (!$Employee) {
@@ -372,7 +453,7 @@ class Employee extends Controller
         // 记录行为
         $table_name = $EmployeeModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('人员信息管理-员工管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, [], ['status' => $status], '修改了员工' . $Employee->name . '状态');
+        $this->addAdminHistory('人员信息管理-员工管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, [], ['status' => $status], '修改了员工' . $Employee->name . '状态');
         // 告知结果
         return             json_send(['code' => 'success', 'msg' => '设置成功']);
     }
@@ -389,17 +470,21 @@ class Employee extends Controller
     {
         // 验证参数
         $request->scene('delete')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $id = request('id', 0);
         $admin_id   = request('access_token.uid', 0); //用户ID
         // 查询用户
         $where = ['id' => $id];
-        $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');
         // 权限判断
-        if ($is_admin != 1 && $company_id != 0) $where[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $where['company_id'] = $company_id;
+        } else {
+            $where['company_id'] = $admin_company_id;
+        }
         // 执行删除
         $Employee = $EmployeeModel->where($where)->first();
         if (!$Employee) {

app/Http/Controllers/Manager/Personnel/Roles.php

@@ -26,8 +26,9 @@ class Roles extends Controller
     public function list(Request $request, RolesModel $RolesModel, RolesAuthRuleModel $RolesAuthRuleModel)
     {
         $request->scene('list')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 查询条件
         $map  = [];
         $limit = request('limit', config('page_num', 10));
@@ -36,7 +37,11 @@ class Roles extends Controller
         $end_time = request('end_time', '');
         $name = request('name', '');
         // 权限判断
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $map[] = ['company_id', '=', $company_id];
+        } else {
+            $map[] = ['company_id', '=', $admin_company_id];
+        }
         // 时间条件
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
@@ -68,14 +73,19 @@ class Roles extends Controller
     public function all(RolesModel $RolesModel)
     {
         $map  = [];
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         $status    = request('status', '0');
         $start_time = request('start_time', '');
         $end_time = request('end_time', '');
         $name = request('name', '');
         // 权限判断
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $map[] = ['company_id', '=', $company_id];
+        } else {
+            $map[] = ['company_id', '=', $admin_company_id];
+        }
         // 时间条件
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
@@ -102,13 +112,18 @@ class Roles extends Controller
     public function detail(Request $request, RolesModel $RolesModel, RolesAuthRuleModel $RolesAuthRuleModel)
     {
         $request->scene('detail')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收参数
         $id = request('id', 0);
         $map = ['id' => $id];
         // 权限判断
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $RolesModel->where($map)->first();
         if (!$data)     return json_send(['code' => 'error', 'msg' => '记录不存在']);
         $menu_ids = $RolesAuthRuleModel->where('role_id', $id)->get(['menu_id'])->toArray();
@@ -127,8 +142,9 @@ class Roles extends Controller
     public function add(Request $request, RolesModel $RolesModel)
     {
         $request->scene('add')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $all_data = request()->all();
         $menu_ids = request('menu_ids', '');
@@ -138,11 +154,15 @@ class Roles extends Controller
         //查询是否存在
         $map = ['name' => $all_data['name']];
         // 权限判断
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
-        $all_data['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $RolesModel->where($map)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 写入数据表
+        $all_data['company_id'] = $company_id;
         $result     =  $RolesModel->addRoles($all_data);
         // 如果操作失败
         if (!$result)     return json_send(['code' => 'error', 'msg' => '新增失败']);
@@ -150,7 +170,7 @@ class Roles extends Controller
         $admin_id   = request('access_token.uid', 0); //用户ID
         $table_name = $RolesModel->getTable();
         $notes_type = 1; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('人员信息管理-角色管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, [], $all_data, '新增了角色' . $all_data['name'] . '信息');
+        $this->addAdminHistory('人员信息管理-角色管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, [], $all_data, '新增了角色' . $all_data['name'] . '信息');
         // 告知结果
         return json_send(['code' => 'success', 'msg' => '新增成功']);
     }
@@ -165,8 +185,9 @@ class Roles extends Controller
     public function edit(Request $request, RolesModel $RolesModel)
     {
         $request->scene('edit')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收参数
         $id         = request('id', 0);
         $menu_ids = request('menu_ids', '');
@@ -177,12 +198,20 @@ class Roles extends Controller
         //查询是否存在
         $map = ['name' => $all_data['name']];
         // 权限判断
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $RolesModel->where($map)->where('id', '!=', $id)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 更新数据表
         $where = ['id' => $id];
-        if ($is_admin != 1 && $company_id != 0) $where[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $where['company_id'] = $company_id;
+        } else {
+            $where['company_id'] = $admin_company_id;
+        }
         $Roles = $RolesModel->where($where)->first();
         if (!$Roles) return json_send(['code' => 'error', 'msg' => '记录不存在']);
         $oldData = $Roles->toArray();
@@ -193,7 +222,7 @@ class Roles extends Controller
         $admin_id   = request('access_token.uid', 0); //用户ID
         $table_name = $RolesModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('人员信息管理-角色管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, $oldData, $all_data, '修改了角色' . $oldData['name'] . '信息');
+        $this->addAdminHistory('人员信息管理-角色管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, $oldData, $all_data, '修改了角色' . $oldData['name'] . '信息');
         // 告知结果
         return json_send(['code' => 'success', 'msg' => '修改成功']);
     }
@@ -209,22 +238,32 @@ class Roles extends Controller
     {
         // 验证参数
         $request->scene('set_status')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $id                = request('id', 0);
         $status            = request('status', 0);
         if ($status == 1) {
             // 查询是否有员工使用该角色
             $employee_where = ['role_id' => $id];
-            if ($is_admin != 1 && $company_id != 0) $employee_where[] = ['company_id', '=', $company_id];
+            // 权限判断
+            if ($is_admin != 1 && $company_id != 0) {
+                $employee_where['company_id'] = $company_id;
+            } else {
+                $employee_where['company_id'] = $admin_company_id;
+            }
             $employee_data = $EmployeeModel->where($employee_where)->first();
             if ($employee_data)    return json_send(['code' => 'error', 'msg' => '该角色已被使用，不能禁用']);
         }
         // 查询用户
         $where = ['id' => $id];
         // 执行修改
-        if ($is_admin != 1 && $company_id != 0) $where[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $where['company_id'] = $company_id;
+        } else {
+            $where['company_id'] = $admin_company_id;
+        }
         $Roles = $RolesModel->where($where)->first();
         if (!$Roles) {
             return json_send(['code' => 'error', 'msg' => '记录不存在']);
@@ -238,7 +277,7 @@ class Roles extends Controller
         $admin_id   = request('access_token.uid', 0); //用户ID
         $table_name = $RolesModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('人员信息管理-角色管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, [], ['status' => $status], '修改了角色' . $Roles->name . '状态');
+        $this->addAdminHistory('人员信息管理-角色管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, [], ['status' => $status], '修改了角色' . $Roles->name . '状态');
         // 告知结果
         return             json_send(['code' => 'success', 'msg' => '设置成功']);
     }
@@ -255,19 +294,28 @@ class Roles extends Controller
     {
         // 验证参数
         $request->scene('delete')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');
         // 接收数据
         $id = request('id', 0);
         // 查询用户
-        $where = ['id' => $id];
-        if ($is_admin != 1 && $company_id != 0) $where[] = ['company_id', '=', $company_id];
+        $employee_where = ['role_id' => $id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $employee_where['company_id'] = $company_id;
+        } else {
+            $employee_where['company_id'] = $admin_company_id;
+        }
         // 查询是否有员工使用该角色
-        $employee_data = $EmployeeModel->where('role_id', $id)->first();
+        $employee_data = $EmployeeModel->where($employee_where)->first();
         if ($employee_data)    return json_send(['code' => 'error', 'msg' => '该角色已被使用，不能删除']);
         // 查询用户
         $where = ['id' => $id];
-        if ($is_admin != 1 && $company_id != 0) $where[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $where['company_id'] = $company_id;
+        } else {
+            $where['company_id'] = $admin_company_id;
+        }
         // 执行删除
         $Roles = $RolesModel->where($where)->first();
         if (!$Roles) {
@@ -281,7 +329,7 @@ class Roles extends Controller
         $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $RolesModel->getTable();
         $notes_type = 3; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('人员信息管理-角色管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, $Roles->toarray(), [], '删除了角色' . $Roles->name . '信息');
+        $this->addAdminHistory('人员信息管理-角色管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, $Roles->toarray(), [], '删除了角色' . $Roles->name . '信息');
         // 告知结果
         return             json_send(['code' => 'success', 'msg' => '删除成功']);
     }

app/Http/Controllers/Manager/Process/LowPriceGoods.php

@@ -35,6 +35,9 @@ class LowPriceGoods extends Controller
     public function list(Request $request, LowPriceGoodsModel $LowPriceGoodsModel, EmployeeModel $EmployeeModel, LowPriceGoodsMemberModel $LowPriceGoodsMemberModel)
     {
         $request->scene('list')->validate();
+        $admin_company_id = request('admin_company_id', '0');
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 查询条件
         $map  = [];
         $limit = request('limit', config('page_num', 10));
@@ -164,6 +167,9 @@ class LowPriceGoods extends Controller
     public function export_excel(Request $request, LowPriceGoodsModel $LowPriceGoodsModel, EmployeeModel $EmployeeModel, LowPriceGoodsMemberModel $LowPriceGoodsMemberModel)
     {
         $request->scene('export_excel')->validate();
+        $admin_company_id = request('admin_company_id', '0');
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 查询条件
         $map  = [];
         $limit = request('limit', config('page_num', 10));
@@ -437,6 +443,9 @@ class LowPriceGoods extends Controller
     public function detail(Request $request, LowPriceGoodsModel $LowPriceGoodsModel, EmployeeModel $EmployeeModel)
     {
         $request->scene('detail')->validate();
+        $admin_company_id = request('admin_company_id', '0');
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收参数
         $id = request('id', 0);
         $map = ['id' => $id];
@@ -468,6 +477,9 @@ class LowPriceGoods extends Controller
     public function add(Request $request, LowPriceGoodsModel $LowPriceGoodsModel)
     {
         $request->scene('add')->validate();
+        $admin_company_id = request('admin_company_id', '0');
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $all_data = request()->all();
         $store_scope = request('store_scope', '');
@@ -494,6 +506,9 @@ class LowPriceGoods extends Controller
     public function edit(Request $request, LowPriceGoodsModel $LowPriceGoodsModel)
     {
         $request->scene('edit')->validate();
+        $admin_company_id = request('admin_company_id', '0');
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收参数
         $id         = request('id', 0);
         // 接收数据
@@ -524,6 +539,9 @@ class LowPriceGoods extends Controller
     {
         // 验证参数
         $request->scene('set_status')->validate();
+        $admin_company_id = request('admin_company_id', '0');
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $id                = request('id', 0);
         $status            = request('status', 0);
@@ -548,6 +566,9 @@ class LowPriceGoods extends Controller
     {
         // 验证参数
         $request->scene('set_processing_status')->validate();
+        $admin_company_id = request('admin_company_id', '0');
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $id                = request('id', 0);
         $processing_status = request('processing_status', 0);
@@ -573,6 +594,9 @@ class LowPriceGoods extends Controller
     {
         // 验证参数
         $request->scene('delete')->validate();
+        $admin_company_id = request('admin_company_id', '0');
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $id = request('id', 0);
         // 查询用户
@@ -596,6 +620,9 @@ class LowPriceGoods extends Controller
     {
         // 验证参数
         $request->scene('data_cleaning')->validate();
+        $admin_company_id = request('admin_company_id', '0');
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         $admin_id   = request('access_token.uid', 0); //用户ID
         $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $message_data = ['page' => '1', 'limit' => 50, 'admin_id' => $admin_id,'is_admin' => $is_admin];
@@ -617,6 +644,9 @@ class LowPriceGoods extends Controller
     {
         // 验证参数
         $request->scene('buying_business')->validate();
+        $admin_company_id = request('admin_company_id', '0');
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         $access_token = request('access_token', '');
         $admin_id = $access_token['uid'];
         // 接收数据
@@ -673,6 +703,9 @@ class LowPriceGoods extends Controller
     {
         // 验证参数
         $request->scene('unprocessed_business')->validate();
+        $admin_company_id = request('admin_company_id', '0');
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         $access_token = request('access_token', '');
         $admin_id = $access_token['uid'];
         // 接收数据
@@ -726,6 +759,9 @@ class LowPriceGoods extends Controller
     {
         // 验证参数
         $request->scene('trace_business')->validate();
+        $admin_company_id = request('admin_company_id', '0');
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         $access_token = request('access_token', '');
         $admin_id = $access_token['uid'];
         // 接收数据
@@ -833,6 +869,9 @@ class LowPriceGoods extends Controller
     public function import_data(Request $request, LowPriceGoodsModel $LowPriceGoodsModel, EmployeeModel $EmployeeModel,CitysModel $CitysModel)
     {
         $request->scene('import_data')->validate();
+        $admin_company_id = request('admin_company_id', '0');
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         $file = $request->file('file');
         // 加载Excel文件
         $spreadsheet = IOFactory::load($file->getPathname());

app/Http/Controllers/Manager/Process/ViolationProduct.php

@@ -33,6 +33,9 @@ class ViolationProduct extends Controller
     public function list(Request $request, ViolationProductModel $ViolationProductModel, EmployeeModel $EmployeeModel, ViolationProductMemberModel $ViolationProductMemberModel)
     {
         $request->scene('list')->validate();
+        $admin_company_id = request('admin_company_id', '0');
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 查询条件
         $map  = [];
         $limit = request('limit', config('page_num', 10));
@@ -161,6 +164,9 @@ class ViolationProduct extends Controller
     public function export_excel(Request $request, ViolationProductModel $ViolationProductModel, EmployeeModel $EmployeeModel, ViolationProductMemberModel $ViolationProductMemberModel)
     {
         $request->scene('export_excel')->validate();
+        $admin_company_id = request('admin_company_id', '0');
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 查询条件
         $map  = [];
         $limit = request('limit', config('page_num', 10));
@@ -433,6 +439,9 @@ class ViolationProduct extends Controller
     public function detail(Request $request, ViolationProductModel $ViolationProductModel, EmployeeModel $EmployeeModel)
     {
         $request->scene('detail')->validate();
+        $admin_company_id = request('admin_company_id', '0');
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收参数
         $id = request('id', 0);
         $map = ['id' => $id];
@@ -464,6 +473,9 @@ class ViolationProduct extends Controller
     public function add(Request $request, ViolationProductModel $ViolationProductModel)
     {
         $request->scene('add')->validate();
+        $admin_company_id = request('admin_company_id', '0');
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $all_data = request()->all();
         $store_scope = request('store_scope', '');
@@ -490,6 +502,9 @@ class ViolationProduct extends Controller
     public function edit(Request $request, ViolationProductModel $ViolationProductModel)
     {
         $request->scene('edit')->validate();
+        $admin_company_id = request('admin_company_id', '0');
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收参数
         $id         = request('id', 0);
         // 接收数据
@@ -520,6 +535,9 @@ class ViolationProduct extends Controller
     {
         // 验证参数
         $request->scene('set_status')->validate();
+        $admin_company_id = request('admin_company_id', '0');
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $id                = request('id', 0);
         $status            = request('status', 0);
@@ -544,6 +562,9 @@ class ViolationProduct extends Controller
     {
         // 验证参数
         $request->scene('set_processing_status')->validate();
+        $admin_company_id = request('admin_company_id', '0');
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $id                = request('id', 0);
         $processing_status = request('processing_status', 0);
@@ -568,6 +589,9 @@ class ViolationProduct extends Controller
     {
         // 验证参数
         $request->scene('delete')->validate();
+        $admin_company_id = request('admin_company_id', '0');
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $id = request('id', 0);
         // 查询用户
@@ -591,6 +615,9 @@ class ViolationProduct extends Controller
     {
         // 验证参数
         $request->scene('data_cleaning')->validate();
+        $admin_company_id = request('admin_company_id', '0');
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         $admin_id   = request('access_token.uid', 0); //用户ID
         $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $message_data = ['page' => '1', 'limit' => 50, 'admin_id' => $admin_id, 'is_admin' => $is_admin];
@@ -664,6 +691,9 @@ class ViolationProduct extends Controller
     public function import_data(Request $request, ViolationProductModel $ViolationProductModel, EmployeeModel $EmployeeModel,CitysModel $CitysModel)
     {
         $request->scene('import_data')->validate();
+        $admin_company_id = request('admin_company_id', '0');
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         $file = $request->file('file');
         // 加载Excel文件
         $spreadsheet = IOFactory::load($file->getPathname());

app/Http/Controllers/Manager/Statistics/OverviewPanel.php

@@ -35,6 +35,7 @@ class OverviewPanel extends Controller
     public function getViolationLinkCount(request $request, ViolationProductModel $violationProductModel)
     {
         $request->scene('getViolationLinkCount')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         $limit = request('limit', config('page_num', 10));
@@ -67,6 +68,7 @@ class OverviewPanel extends Controller
      */
     public function Violation_export(request $request, ViolationProductModel $violationProductModel)
     {
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         $yesterdayStart = Carbon::yesterday()->startOfDay()->getTimestamp(); // 昨天开始时间 00:00:00
@@ -154,6 +156,7 @@ class OverviewPanel extends Controller
     public function get_violation_company_count(request $request, ViolationProductModel $violationProductModel)
     {
         $request->scene('get_violation_company_count')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         $limit = request('limit', config('page_num', 10));
@@ -186,6 +189,7 @@ class OverviewPanel extends Controller
      */
     public function violation_company_export(request $request, ViolationProductModel $violationProductModel)
     {
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         $yesterdayStart = Carbon::now()->startOfMonth()->getTimestamp(); // 本月第一天 00:00:00
@@ -274,6 +278,7 @@ class OverviewPanel extends Controller
     public function getLowPriceLinkCount(request $request, LowPriceGoodsModel $LowPriceGoodsModel)
     {
         $request->scene('getLowPriceLinkCount')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         $limit = request('limit', config('page_num', 10));
@@ -306,6 +311,7 @@ class OverviewPanel extends Controller
      */
     public function low_price_export(request $request, LowPriceGoodsModel $LowPriceGoodsModel)
     {
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         $yesterdayStart = Carbon::yesterday()->startOfDay()->getTimestamp(); // 昨天开始时间 00:00:00
@@ -393,6 +399,7 @@ class OverviewPanel extends Controller
     public function getLowPriceCompanyCount(request $request, LowPriceGoodsModel $LowPriceGoodsModel)
     {
         $request->scene('getLowPriceCompanyCount')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         $limit = request('limit', config('page_num', 10));
@@ -425,6 +432,7 @@ class OverviewPanel extends Controller
      */
     public function low_price_company_export(request $request, LowPriceGoodsModel $LowPriceGoodsModel)
     {
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         $yesterdayStart = Carbon::now()->startOfMonth()->getTimestamp(); // 本月第一天 00:00:00
@@ -511,6 +519,7 @@ class OverviewPanel extends Controller
     public function get_product_trend(request $request, LowPriceGoodsModel $LowPriceGoodsModel, ViolationProductModel $violationProductModel, LowPriceGoodsMemberModel $LowPriceGoodsMemberModel, ViolationProductMemberModel $ViolationProductMemberModel)
     {
         $request->scene('get_product_trend')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 查询条件
@@ -675,6 +684,7 @@ class OverviewPanel extends Controller
     public function product_trend_export(request $request, LowPriceGoodsModel $LowPriceGoodsModel, ViolationProductModel $violationProductModel, LowPriceGoodsMemberModel $LowPriceGoodsMemberModel, ViolationProductMemberModel $ViolationProductMemberModel)
     {
         $request->scene('product_trend_export')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 查询条件
@@ -899,6 +909,7 @@ class OverviewPanel extends Controller
     public function get_store_trend(Request $request, LowPriceGoodsModel $LowPriceGoodsModel, ViolationProductModel $violationProductModel, LowPriceGoodsMemberModel $LowPriceGoodsMemberModel, ViolationProductMemberModel $ViolationProductMemberModel)
     {
         $request->scene('get_store_trend')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 查询条件
@@ -1063,6 +1074,7 @@ class OverviewPanel extends Controller
     public function store_trend_export(Request $request, LowPriceGoodsModel $LowPriceGoodsModel, ViolationProductModel $violationProductModel, LowPriceGoodsMemberModel $LowPriceGoodsMemberModel, ViolationProductMemberModel $ViolationProductMemberModel)
     {
         $request->scene('store_trend_export')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 查询条件

app/Http/Controllers/Manager/WashConfig/CompanyCategory.php

@@ -15,7 +15,7 @@ use App\Models\Manager\WashConfig\ViolationStore as ViolationStoreModel;
  */
 class CompanyCategory extends Controller
 {
-     /**
+    /**
      * 列表
      * @author    唐远望
      * @version   1.0
@@ -25,8 +25,9 @@ class CompanyCategory extends Controller
     public function list(Request $request, CompanyCategoryModel $CompanyCategoryModel)
     {
         $request->scene('list')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 查询条件
         $map  = [];
         $limit = request('limit', config('page_num', 10));
@@ -41,7 +42,11 @@ class CompanyCategory extends Controller
         if (is_numeric($status)) $map[] = ['status', '=', $status];
         if ($name) $map[] = ['name', 'like', "%$name%"];
         // 查询数据
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $map[] = ['company_id', '=', $company_id];
+        } else {
+            $map[] = ['company_id', '=', $admin_company_id];
+        }
         $result = $CompanyCategoryModel->query()
             ->where($map)
             ->orderByDesc('id')
@@ -62,8 +67,9 @@ class CompanyCategory extends Controller
     public function all(CompanyCategoryModel $CompanyCategoryModel)
     {
         $map  = [];
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         $status    = request('status', '0');
         $start_time = request('start_time', '');
         $end_time = request('end_time', '');
@@ -74,7 +80,11 @@ class CompanyCategory extends Controller
         // 其他条件
         if ($name) $map[] = ['name', 'like', "%$name%"];
         if (is_numeric($status)) $map[] = ['status', '=', $status];
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $map[] = ['company_id', '=', $company_id];
+        } else {
+            $map[] = ['company_id', '=', $admin_company_id];
+        }
         $result = $CompanyCategoryModel->query()
             ->where($map)
             ->select(['id', 'name'])
@@ -95,12 +105,17 @@ class CompanyCategory extends Controller
     public function detail(Request $request, CompanyCategoryModel $CompanyCategoryModel)
     {
         $request->scene('detail')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收参数
         $id = request('id', 0);
         $map = ['id' => $id];
-        if ($is_admin != 1 && $company_id != 0) $map['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $CompanyCategoryModel->where($map)->first();
         if (!$data)     return json_send(['code' => 'error', 'msg' => '记录不存在']);
         // 加载模板
@@ -117,15 +132,20 @@ class CompanyCategory extends Controller
     public function add(Request $request, CompanyCategoryModel $CompanyCategoryModel)
     {
         $request->scene('add')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $all_data = request()->all();
         $store_scope = request('store_scope', '');
         $all_data['store_scope'] = $store_scope;
         //查询是否存在
         $map = ['name' => $all_data['name']];
-        if ($is_admin != 1 && $company_id != 0) $map['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $CompanyCategoryModel->where($map)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 写入数据表
@@ -137,7 +157,7 @@ class CompanyCategory extends Controller
         $admin_id   = request('access_token.uid', 0); //用户ID
         $table_name = $CompanyCategoryModel->getTable();
         $notes_type = 1; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-公司分类管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type,[],$all_data, '新增了分类' . $all_data['name'] . '信息');
+        $this->addAdminHistory('清洗配置-公司分类管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, [], $all_data, '新增了分类' . $all_data['name'] . '信息');
         // 告知结果
         return json_send(['code' => 'success', 'msg' => '新增成功']);
     }
@@ -152,8 +172,9 @@ class CompanyCategory extends Controller
     public function edit(Request $request, CompanyCategoryModel $CompanyCategoryModel)
     {
         $request->scene('edit')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收参数
         $id         = request('id', 0);
         // 接收数据
@@ -162,12 +183,20 @@ class CompanyCategory extends Controller
         $all_data['store_scope'] = $store_scope;
         //查询是否存在
         $map = ['name' => $all_data['name']];
-        if ($is_admin != 1 && $company_id != 0) $map['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $CompanyCategoryModel->where($map)->where('id', '!=', $id)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 更新数据表
         $where = ['id' => $id];
-        if ($is_admin != 1 && $company_id != 0) $where['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $where['company_id'] = $company_id;
+        } else {
+            $where['company_id'] = $admin_company_id;
+        }
         $CompanyCategory = $CompanyCategoryModel->where($where)->first();
         if (!$CompanyCategory) return json_send(['code' => 'error', 'msg' => '记录不存在']);
         $oldData = $CompanyCategory->toArray();
@@ -179,7 +208,7 @@ class CompanyCategory extends Controller
         $admin_id   = request('access_token.uid', 0); //用户ID
         $table_name = $CompanyCategoryModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-公司分类管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type,$oldData,$all_data, '修改了分类' .$oldData['name'] . '信息');
+        $this->addAdminHistory('清洗配置-公司分类管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, $oldData, $all_data, '修改了分类' . $oldData['name'] . '信息');
         // 告知结果
         return json_send(['code' => 'success', 'msg' => '修改成功']);
     }
@@ -191,19 +220,24 @@ class CompanyCategory extends Controller
      * @date      2025-12-19
      * 
      */
-    public function set_status(Request $request, CompanyCategoryModel $CompanyCategoryModel,ViolationStoreModel $ViolationStoreModel)
+    public function set_status(Request $request, CompanyCategoryModel $CompanyCategoryModel, ViolationStoreModel $ViolationStoreModel)
     {
         // 验证参数
         $request->scene('set_status')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $id                = request('id', 0);
         $status            = request('status', 0);
         //如果是禁用，校验是否被使用
         if ($status == 1) {
             $violation_store_where = ['category_id' => $id];
-            if ($is_admin != 1 && $company_id != 0) $violation_store_where['company_id'] = $company_id;
+            if ($is_admin != 1 && $company_id != 0) {
+                $violation_store_where['company_id'] = $company_id;
+            } else {
+                $violation_store_where['company_id'] = $admin_company_id;
+            }
             $violation_store_count = $ViolationStoreModel->where($violation_store_where)->count();
             if ($violation_store_count > 0) {
                 return json_send(['code' => 'error', 'msg' => '该分类下存在公司配置，禁用失败']);
@@ -211,7 +245,11 @@ class CompanyCategory extends Controller
         }
         // 查询用户
         $where = ['id' => $id];
-        if ($is_admin != 1 && $company_id != 0) $where['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $where['company_id'] = $company_id;
+        } else {
+            $where['company_id'] = $admin_company_id;
+        }
         $CompanyCategory = $CompanyCategoryModel->where($where)->first();
         if (!$CompanyCategory) return json_send(['code' => 'error', 'msg' => '记录不存在']);
         // 执行修改
@@ -222,7 +260,7 @@ class CompanyCategory extends Controller
         $admin_id   = request('access_token.uid', 0); //用户ID
         $table_name = $CompanyCategoryModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-公司分类管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type,[], ['status' => $status], '修改了分类' .$CompanyCategory->name . '状态');
+        $this->addAdminHistory('清洗配置-公司分类管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, [], ['status' => $status], '修改了分类' . $CompanyCategory->name . '状态');
         // 告知结果
         return             json_send(['code' => 'success', 'msg' => '设置成功']);
     }
@@ -235,16 +273,21 @@ class CompanyCategory extends Controller
      * @date      2025-12-19
      * 
      */
-    public function delete(Request $request, CompanyCategoryModel $CompanyCategoryModel,ViolationStoreModel $ViolationStoreModel)
+    public function delete(Request $request, CompanyCategoryModel $CompanyCategoryModel, ViolationStoreModel $ViolationStoreModel)
     {
         // 验证参数
         $request->scene('delete')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $id = request('id', 0);
         $violation_store_where = ['category_id' => $id];
-        if ($is_admin != 1 && $company_id != 0) $violation_store_where['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $violation_store_where['company_id'] = $company_id;
+        } else {
+            $violation_store_where['company_id'] = $admin_company_id;
+        }
         $violation_store_count = $ViolationStoreModel->where($violation_store_where)->count();
         if ($violation_store_count > 0) {
             return json_send(['code' => 'error', 'msg' => '该分类下存在公司配置，删除失败']);
@@ -252,7 +295,11 @@ class CompanyCategory extends Controller
         // 查询用户
         $where = ['id' => $id];
         // 执行删除
-        if ($is_admin != 1 && $company_id != 0) $where['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $where['company_id'] = $company_id;
+        } else {
+            $where['company_id'] = $admin_company_id;
+        }
         $CompanyCategory = $CompanyCategoryModel->where($where)->first();
         if (!$CompanyCategory) return json_send(['code' => 'error', 'msg' => '记录不存在']);
         $result = $CompanyCategory->delete();
@@ -262,8 +309,8 @@ class CompanyCategory extends Controller
         $admin_id   = request('access_token.uid', 0); //用户ID
         $table_name = $CompanyCategoryModel->getTable();
         $notes_type = 3; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-公司分类管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, $CompanyCategory->toArray(), [], '删除了分类' .$CompanyCategory->name . '信息');
+        $this->addAdminHistory('清洗配置-公司分类管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, $CompanyCategory->toArray(), [], '删除了分类' . $CompanyCategory->name . '信息');
         // 告知结果
         return             json_send(['code' => 'success', 'msg' => '删除成功']);
     }
-}
+}

app/Http/Controllers/Manager/WashConfig/ControlGoods.php

@@ -28,8 +28,9 @@ class ControlGoods extends Controller
     public function list(Request $request, ControlGoodsModel $ControlGoodsModel, ViolationStoreModel $ViolationStoreModel, ControlGoodsCompanyModel $ControlGoodsCompanyModel, ProductCategoryModel $ProductCategoryModel)
     {
         $request->scene('list')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 查询条件
         $map  = [];
         $limit = request('limit', config('page_num', 10));
@@ -52,7 +53,11 @@ class ControlGoods extends Controller
         if ($company_scope) $map[] = ['company_scope', '=', $company_scope];
         if ($category_id) $map[] = ['category_id', '=', $category_id];
         // 查询数据
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $map[] = ['company_id', '=', $company_id];
+        } else {
+            $map[] = ['company_id', '=', $admin_company_id];
+        }
         $result = $ControlGoodsModel->query()
             ->where($map)
             ->orderByDesc('id')
@@ -62,7 +67,7 @@ class ControlGoods extends Controller
         if (isset($result['data']) && count($result['data']) > 0) {
             foreach ($result['data'] as $key => $value) {
                 $result['data'][$key]['platform'] = isset($value['platform']) ? explode(',', $value['platform']) : '';
-                $category_name = $value['category_id'] > 0 ? $ProductCategoryModel->where('id', $value['category_id'])->value('name'):'';
+                $category_name = $value['category_id'] > 0 ? $ProductCategoryModel->where('id', $value['category_id'])->value('name') : '';
                 $result['data'][$key]['category_name'] = $category_name;
                 //查询店铺名称
                 if (trim($value['store_scope']) == '') {
@@ -91,15 +96,20 @@ class ControlGoods extends Controller
      * @version   1.0
      * @date      2025-12-03
      */
-    public function detail(Request $request, ControlGoodsModel $ControlGoodsModel,ControlGoodsCompanyModel $ControlGoodsCompanyModel, ProductCategoryModel $ProductCategoryModel)
+    public function detail(Request $request, ControlGoodsModel $ControlGoodsModel, ControlGoodsCompanyModel $ControlGoodsCompanyModel, ProductCategoryModel $ProductCategoryModel)
     {
         $request->scene('detail')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收参数
         $id = request('id', 0);
         $map = ['id' => $id];
-        if ($is_admin != 1 && $company_id != 0) $map['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $ControlGoodsModel->where($map)->first();
         if (!$data)     return json_send(['code' => 'error', 'msg' => '记录不存在']);
         //查询店铺名称
@@ -111,7 +121,7 @@ class ControlGoods extends Controller
         //查询公司名称
         if ($data->company_scope == '1') {
             $data->company_name = ['全部公司'];
-            $data->company_ids ='';
+            $data->company_ids = '';
         } else {
             $company_data = $ControlGoodsCompanyModel->where('control_product_logid', $data->id)
                 ->join('washconfig_violation_store', 'washconfig_violation_store.id', '=', 'washconfig_control_product_company.company_id')
@@ -119,8 +129,8 @@ class ControlGoods extends Controller
             $data->company_name = !empty($company_data) ? array_column($company_data, 'company_name') : '';
             $data->company_ids = !empty($company_data) ? array_column($company_data, 'company_id') : '';
         }
-        $data->platform = isset($data->platform) ? explode(',',$data->platform) : '';
-        $data->category_name = $data->category_id > 0 ? $ProductCategoryModel->where('id', $data->category_id)->value('name'):'';
+        $data->platform = isset($data->platform) ? explode(',', $data->platform) : '';
+        $data->category_name = $data->category_id > 0 ? $ProductCategoryModel->where('id', $data->category_id)->value('name') : '';
         // 加载模板
         return json_send(['code' => 'success', 'msg' => '获取成功', 'data' => $data]);
     }
@@ -135,8 +145,9 @@ class ControlGoods extends Controller
     public function add(Request $request, ControlGoodsModel $ControlGoodsModel)
     {
         $request->scene('add')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $all_data = request()->all();
         $store_scope = request('store_scope', '');
@@ -149,7 +160,11 @@ class ControlGoods extends Controller
         $all_data['specify_responsible_person'] = $specify_responsible_person;
         //查询是否存在
         $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'], 'platform' => $all_data['platform']];
-        if ($is_admin != 1 && $company_id != 0) $map['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $ControlGoodsModel->where($map)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 写入数据表
@@ -171,6 +186,7 @@ class ControlGoods extends Controller
     public function edit(Request $request, ControlGoodsModel $ControlGoodsModel)
     {
         $request->scene('edit')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收参数
@@ -187,7 +203,11 @@ class ControlGoods extends Controller
         $all_data['specify_responsible_person'] = $specify_responsible_person;
         //查询是否存在
         $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'], 'platform' => $all_data['platform']];
-        if ($is_admin != 1 && $company_id != 0) $map['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $ControlGoodsModel->where($map)->where('id', '!=', $id)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 更新数据表
@@ -210,15 +230,20 @@ class ControlGoods extends Controller
     {
         // 验证参数
         $request->scene('set_status')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $id                = request('id', 0);
         $status            = request('status', 0);
         if ($status == 0) {
             //获取管控商品启动数量
             $control_product_where = ['status' => 0];
-            if ($is_admin != 1 && $company_id != 0) $control_product_where['company_id'] = $company_id;
+            if ($is_admin != 1 && $company_id != 0) {
+                $control_product_where['company_id'] = $company_id;
+            } else {
+                $control_product_where['company_id'] = $admin_company_id;
+            }
             $control_product_count = $ControlGoodsModel->where($control_product_where)->count();
             //计算总数量
             $product_totle = $control_product_count;
@@ -229,7 +254,11 @@ class ControlGoods extends Controller
         }
         // 查询用户
         $where = ['id' => $id];
-        if ($is_admin != 1 && $company_id != 0) $where['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $where['company_id'] = $company_id;
+        } else {
+            $where['company_id'] = $admin_company_id;
+        }
         $LowProduct = $ControlGoodsModel->where($where)->first();
         if (!$LowProduct) return json_send(['code' => 'error', 'msg' => '记录不存在']);
         // 执行修改
@@ -240,7 +269,7 @@ class ControlGoods extends Controller
         $admin_id   = request('access_token.uid', 0); //用户ID
         $table_name = $ControlGoodsModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-管控商品管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, [], ['status' => $status], '修改了管控商品' . $LowProduct->product_name . '状态');
+        $this->addAdminHistory('清洗配置-管控商品管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, [], ['status' => $status], '修改了管控商品' . $LowProduct->product_name . '状态');
         // 告知结果
         return             json_send(['code' => 'success', 'msg' => '设置成功']);
     }
@@ -257,14 +286,19 @@ class ControlGoods extends Controller
     {
         // 验证参数
         $request->scene('delete')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $id = request('id', 0);
         // 查询用户
         $where = ['id' => $id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $where['company_id'] = $company_id;
+        } else {
+            $where['company_id'] = $admin_company_id;
+        }
         // 执行删除
-        if ($is_admin != 1 && $company_id != 0) $where['company_id'] = $company_id;
         $LowProduct = $ControlGoodsModel->where($where)->first();
         if (!$LowProduct) {
             return json_send(['code' => 'error', 'msg' => '记录不存在']);
@@ -277,7 +311,7 @@ class ControlGoods extends Controller
             $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
             $table_name = $ControlGoodsModel->getTable();
             $notes_type = 3; //操作类型，1添加，2修改，3=删除
-            $this->addAdminHistory('清洗配置-管控商品管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, $LowProduct->toarray(), [], '删除了管控商品' . $LowProduct->product_name . '信息');
+            $this->addAdminHistory('清洗配置-管控商品管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, $LowProduct->toarray(), [], '删除了管控商品' . $LowProduct->product_name . '信息');
             DB::commit();
             // 告知结果
             return             json_send(['code' => 'success', 'msg' => '删除成功']);

app/Http/Controllers/Manager/WashConfig/LowPriceGoods.php

@@ -30,8 +30,9 @@ class LowPriceGoods extends Controller
     public function list(Request $request, LowPriceGoodsModel $LowPriceGoodsModel, ViolationStoreModel $ViolationStoreModel, LowPriceGoodsCompanyModel $LowPriceGoodsCompanyModel, ProductCategoryModel $ProductCategoryModel)
     {
         $request->scene('list')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 查询条件
         $map  = [];
         $limit = request('limit', config('page_num', 10));
@@ -54,7 +55,11 @@ class LowPriceGoods extends Controller
         if ($company_scope) $map[] = ['company_scope', '=', $company_scope];
         if ($category_id) $map[] = ['category_id', '=', $category_id];
         // 查询数据
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $map[] = ['company_id', '=', $company_id];
+        } else {
+            $map[] = ['company_id', '=', $admin_company_id];
+        }
         $result = $LowPriceGoodsModel->query()
             ->where($map)
             ->orderByDesc('id')
@@ -96,12 +101,17 @@ class LowPriceGoods extends Controller
     public function detail(Request $request, LowPriceGoodsModel $LowPriceGoodsModel, LowPriceGoodsCompanyModel $LowPriceGoodsCompanyModel, ProductCategoryModel $ProductCategoryModel)
     {
         $request->scene('detail')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收参数
         $id = request('id', 0);
         $map = ['id' => $id];
-        if ($is_admin != 1 && $company_id != 0) $map['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $LowPriceGoodsModel->where($map)->first();
         if (!$data)     return json_send(['code' => 'error', 'msg' => '记录不存在']);
         //查询店铺名称
@@ -134,11 +144,12 @@ class LowPriceGoods extends Controller
      * @date      2025-12-02
      * 
      */
-    public function add(Request $request, LowPriceGoodsModel $LowPriceGoodsModel,ViolationProductModel $ViolationProductModel)
+    public function add(Request $request, LowPriceGoodsModel $LowPriceGoodsModel, ViolationProductModel $ViolationProductModel)
     {
         $request->scene('add')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         //获取禁止商品启动数量
         $violation_product_count = $ViolationProductModel->where('status', 0)->count();
         //获取低价挂网商品启用数量
@@ -161,7 +172,11 @@ class LowPriceGoods extends Controller
         $all_data['specify_responsible_person'] = $specify_responsible_person;
         //查询是否存在
         $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'], 'platform' => $all_data['platform']];
-        if ($is_admin != 1 && $company_id != 0) $map['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $LowPriceGoodsModel->where($map)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 写入数据表
@@ -174,7 +189,7 @@ class LowPriceGoods extends Controller
         $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $LowPriceGoodsModel->getTable();
         $notes_type = 1; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-低价商品管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, [], $all_data, '新增了低价商品' . $all_data['product_name'] . '信息');
+        $this->addAdminHistory('清洗配置-低价商品管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, [], $all_data, '新增了低价商品' . $all_data['product_name'] . '信息');
         // 告知结果
         return json_send(['code' => 'success', 'msg' => '新增成功']);
     }
@@ -189,8 +204,9 @@ class LowPriceGoods extends Controller
     public function edit(Request $request, LowPriceGoodsModel $LowPriceGoodsModel)
     {
         $request->scene('edit')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收参数
         $id         = request('id', 0);
         // 接收数据
@@ -205,12 +221,20 @@ class LowPriceGoods extends Controller
         $all_data['specify_responsible_person'] = $specify_responsible_person;
         //查询是否存在
         $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'], 'platform' => $all_data['platform']];
-        if ($is_admin != 1 && $company_id != 0) $map['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $LowPriceGoodsModel->where($map)->where('id', '!=', $id)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 更新数据表
         $where = ['id' => $id];
-        if ($is_admin != 1 && $company_id != 0) $where['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $where['company_id'] = $company_id;
+        } else {
+            $where['company_id'] = $admin_company_id;
+        }
         $LowProduct = $LowPriceGoodsModel->where($where)->first();
         if (!$LowProduct) return json_send(['code' => 'error', 'msg' => '记录不存在']);
         $oldData = $LowProduct->toarray();
@@ -222,7 +246,7 @@ class LowPriceGoods extends Controller
         $admin_id   = request('access_token.uid', 0); //用户ID
         $table_name = $LowPriceGoodsModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-低价商品管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type,$oldData, $all_data, '修改了低价商品' . $oldData['product_name'] . '信息');
+        $this->addAdminHistory('清洗配置-低价商品管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, $oldData, $all_data, '修改了低价商品' . $oldData['product_name'] . '信息');
         // 告知结果
         return json_send(['code' => 'success', 'msg' => '修改成功']);
     }
@@ -234,19 +258,24 @@ class LowPriceGoods extends Controller
      * @date      2025-12-02
      * 
      */
-    public function set_status(Request $request, LowPriceGoodsModel $LowPriceGoodsModel,ViolationProductModel $ViolationProductModel)
+    public function set_status(Request $request, LowPriceGoodsModel $LowPriceGoodsModel, ViolationProductModel $ViolationProductModel)
     {
         // 验证参数
         $request->scene('set_status')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $id                = request('id', 0);
         $status            = request('status', 0);
         if ($status == 0) {
             //获取禁止商品启动数量
             $status_where = ['status' => 0];
-            if ($is_admin != 1 && $company_id != 0) $status_where['company_id'] = $company_id;
+            if ($is_admin != 1 && $company_id != 0) {
+                $status_where['company_id'] = $company_id;
+            } else {
+                $status_where['company_id'] = $admin_company_id;
+            }
             $violation_product_count = $ViolationProductModel->where($status_where)->count();
             //获取低价挂网商品启用数量
             $lowprice_product_count = $LowPriceGoodsModel->where($status_where)->count();
@@ -259,7 +288,11 @@ class LowPriceGoods extends Controller
         }
         // 查询用户
         $where = ['id' => $id];
-        if ($is_admin != 1 && $company_id != 0) $where['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $where['company_id'] = $company_id;
+        } else {
+            $where['company_id'] = $admin_company_id;
+        }
         $LowProduct = $LowPriceGoodsModel->where($where)->first();
         if (!$LowProduct) return json_send(['code' => 'error', 'msg' => '记录不存在']);
         // 执行修改
@@ -270,7 +303,7 @@ class LowPriceGoods extends Controller
         $admin_id   = request('access_token.uid', 0); //用户ID
         $table_name = $LowPriceGoodsModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-低价商品管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, [], ['status' => $status], '修改了低价商品' . $LowProduct->product_name . '状态');
+        $this->addAdminHistory('清洗配置-低价商品管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, [], ['status' => $status], '修改了低价商品' . $LowProduct->product_name . '状态');
         // 告知结果
         return             json_send(['code' => 'success', 'msg' => '设置成功']);
     }
@@ -287,14 +320,19 @@ class LowPriceGoods extends Controller
     {
         // 验证参数
         $request->scene('delete')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $id = request('id', 0);
         // 查询用户
         $where = ['id' => $id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $where['company_id'] = $company_id;
+        } else {
+            $where['company_id'] = $admin_company_id;
+        }
         // 执行删除
-        if ($is_admin != 1 && $company_id != 0) $where['company_id'] = $company_id;
         $LowProduct = $LowPriceGoodsModel->where($where)->first();
         if (!$LowProduct) {
             return json_send(['code' => 'error', 'msg' => '记录不存在']);
@@ -312,7 +350,7 @@ class LowPriceGoods extends Controller
             $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
             $table_name = $LowPriceGoodsModel->getTable();
             $notes_type = 3; //操作类型，1添加，2修改，3=删除
-            $this->addAdminHistory('清洗配置-低价商品管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, $LowProduct->toarray(), [], '删除了低价商品' . $LowProduct->product_name . '信息');
+            $this->addAdminHistory('清洗配置-低价商品管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, $LowProduct->toarray(), [], '删除了低价商品' . $LowProduct->product_name . '信息');
             DB::commit();
             // 告知结果
             return             json_send(['code' => 'success', 'msg' => '删除成功']);

app/Http/Controllers/Manager/WashConfig/PlatForm.php

@@ -25,6 +25,7 @@ class PlatForm extends Controller
     public function list(Request $request, PlatFormModel $PlatFormModel, EmployeeModel $EmployeeModel)
     {
         $request->scene('list')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 查询条件
@@ -68,6 +69,7 @@ class PlatForm extends Controller
     public function all(PlatFormModel $PlatFormModel)
     {
         $map  = [];
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         $status    = request('status', '0');
@@ -100,6 +102,7 @@ class PlatForm extends Controller
     public function detail(Request $request, PlatFormModel $PlatFormModel, EmployeeModel $EmployeeModel)
     {
         $request->scene('detail')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收参数
@@ -124,6 +127,7 @@ class PlatForm extends Controller
     public function add(Request $request, PlatFormModel $PlatFormModel)
     {
         $request->scene('add')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收数据
@@ -158,6 +162,7 @@ class PlatForm extends Controller
     public function edit(Request $request, PlatFormModel $PlatFormModel)
     {
         $request->scene('edit')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收参数
@@ -167,9 +172,9 @@ class PlatForm extends Controller
         $employee_ids = request('employee_ids', '');
         $all_data['employee_ids'] = $employee_ids;
         // //查询是否存在
-        // $map = ['name' => $all_data['name']];
-        // $data = $PlatFormModel->where($map)->where('id', '!=', $id)->first();
-        // if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
+        $map = ['name' => $all_data['name']];
+        $data = $PlatFormModel->where($map)->where('id', '!=', $id)->first();
+        if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 更新数据表
         $where = ['id' => $id];
         $PlatForm = $PlatFormModel->where($where)->first();
@@ -199,6 +204,7 @@ class PlatForm extends Controller
     {
         // 验证参数
         $request->scene('set_status')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收数据
@@ -233,6 +239,7 @@ class PlatForm extends Controller
     {
         // 验证参数
         $request->scene('delete')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收数据

app/Http/Controllers/Manager/WashConfig/ProductCategory.php

@@ -26,8 +26,9 @@ class ProductCategory extends Controller
     public function list(Request $request, ProductCategoryModel $ProductCategoryModel)
     {
         $request->scene('list')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 查询条件
         $map  = [];
         $limit = request('limit', config('page_num', 10));
@@ -42,7 +43,11 @@ class ProductCategory extends Controller
         if (is_numeric($status)) $map[] = ['status', '=', $status];
         if ($name) $map[] = ['name', 'like', "%$name%"];
         // 查询数据
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $map[] = ['company_id', '=', $company_id];
+        } else {
+            $map[] = ['company_id', '=', $admin_company_id];
+        }
         $result = $ProductCategoryModel->query()
             ->where($map)
             ->orderByDesc('id')
@@ -63,8 +68,9 @@ class ProductCategory extends Controller
     public function all(ProductCategoryModel $ProductCategoryModel)
     {
         $map  = [];
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         $status    = request('status', '0');
         $start_time = request('start_time', '');
         $end_time = request('end_time', '');
@@ -75,7 +81,11 @@ class ProductCategory extends Controller
         // 其他条件
         if ($name) $map[] = ['name', 'like', "%$name%"];
         if (is_numeric($status)) $map[] = ['status', '=', $status];
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $map[] = ['company_id', '=', $company_id];
+        } else {
+            $map[] = ['company_id', '=', $admin_company_id];
+        }
         $result = $ProductCategoryModel->query()
             ->where($map)
             ->orderByDesc('id')
@@ -95,12 +105,17 @@ class ProductCategory extends Controller
     public function detail(Request $request, ProductCategoryModel $ProductCategoryModel)
     {
         $request->scene('detail')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收参数
         $id = request('id', 0);
         $map = ['id' => $id];
-        if ($is_admin != 1 && $company_id != 0) $map['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $ProductCategoryModel->where($map)->first();
         if (!$data)     return json_send(['code' => 'error', 'msg' => '记录不存在']);
         // 加载模板
@@ -117,15 +132,20 @@ class ProductCategory extends Controller
     public function add(Request $request, ProductCategoryModel $ProductCategoryModel)
     {
         $request->scene('add')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $all_data = request()->all();
         $store_scope = request('store_scope', '');
         $all_data['store_scope'] = $store_scope;
         //查询是否存在
         $map = ['name' => $all_data['name']];
-        if ($is_admin != 1 && $company_id != 0) $map['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $ProductCategoryModel->where($map)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 写入数据表
@@ -137,7 +157,7 @@ class ProductCategory extends Controller
         $admin_id   = request('access_token.uid', 0); //用户ID
         $table_name = $ProductCategoryModel->getTable();
         $notes_type = 1; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-商品分类管理',$company_id, $admin_id, $is_admin, $table_name,$notes_type, [], $all_data, '新增了商品分类' . $all_data['name'] . '信息');
+        $this->addAdminHistory('清洗配置-商品分类管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, [], $all_data, '新增了商品分类' . $all_data['name'] . '信息');
         // 告知结果
         return json_send(['code' => 'success', 'msg' => '新增成功']);
     }
@@ -152,8 +172,9 @@ class ProductCategory extends Controller
     public function edit(Request $request, ProductCategoryModel $ProductCategoryModel)
     {
         $request->scene('edit')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收参数
         $id         = request('id', 0);
         // 接收数据
@@ -162,12 +183,20 @@ class ProductCategory extends Controller
         $all_data['store_scope'] = $store_scope;
         //查询是否存在
         $map = ['name' => $all_data['name']];
-        if ($is_admin != 1 && $company_id != 0) $map['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $ProductCategoryModel->where($map)->where('id', '!=', $id)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 更新数据表
         $where = ['id' => $id];
-        if ($is_admin != 1 && $company_id != 0) $where['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $where['company_id'] = $company_id;
+        } else {
+            $where['company_id'] = $admin_company_id;
+        }
         $ProductCategory = $ProductCategoryModel->where($where)->first();
         if (!$ProductCategory) return json_send(['code' => 'error', 'msg' => '记录不存在']);
         $oldData = $ProductCategory->toarray();
@@ -179,7 +208,7 @@ class ProductCategory extends Controller
         $admin_id   = request('access_token.uid', 0); //用户ID
         $table_name = $ProductCategoryModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-商品分类管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type,$oldData, $all_data, '修改了商品分类' .$oldData['name'] . '信息');
+        $this->addAdminHistory('清洗配置-商品分类管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, $oldData, $all_data, '修改了商品分类' . $oldData['name'] . '信息');
         // 告知结果
         return json_send(['code' => 'success', 'msg' => '修改成功']);
     }
@@ -191,19 +220,24 @@ class ProductCategory extends Controller
      * @date      2025-12-18
      * 
      */
-    public function set_status(Request $request, ProductCategoryModel $ProductCategoryModel,LowPriceGoodsModel $LowPriceGoodsModel,ViolationProductModel $ViolationProductModel)
+    public function set_status(Request $request, ProductCategoryModel $ProductCategoryModel, LowPriceGoodsModel $LowPriceGoodsModel, ViolationProductModel $ViolationProductModel)
     {
         // 验证参数
         $request->scene('set_status')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $id                = request('id', 0);
         $status            = request('status', 0);
         //如果是禁用，校验是否被使用
         if ($status == 1) {
             $product_where = ['category_id' => $id];
-            if ($is_admin != 1 && $company_id != 0) $product_where['company_id'] = $company_id;
+            if ($is_admin != 1 && $company_id != 0) {
+                $product_where['company_id'] = $company_id;
+            } else {
+                $product_where['company_id'] = $admin_company_id;
+            }
             $low_price_goods_count = $LowPriceGoodsModel->where($product_where)->count();
             if ($low_price_goods_count > 0) {
                 return json_send(['code' => 'error', 'msg' => '该分类下存在低价商品配置，禁用失败']);
@@ -215,7 +249,11 @@ class ProductCategory extends Controller
         }
         // 查询用户
         $where = ['id' => $id];
-        if ($is_admin != 1 && $company_id != 0) $where['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $where['company_id'] = $company_id;
+        } else {
+            $where['company_id'] = $admin_company_id;
+        }
         $ProductCategory = $ProductCategoryModel->where($where)->first();
         if (!$ProductCategory) return json_send(['code' => 'error', 'msg' => '记录不存在']);
         // 执行修改
@@ -226,7 +264,7 @@ class ProductCategory extends Controller
         $admin_id   = request('access_token.uid', 0); //用户ID
         $table_name = $ProductCategoryModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-商品分类管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, [], ['status' => $status], '修改了商品分类' . $ProductCategory->name . '状态');
+        $this->addAdminHistory('清洗配置-商品分类管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, [], ['status' => $status], '修改了商品分类' . $ProductCategory->name . '状态');
         // 告知结果
         return             json_send(['code' => 'success', 'msg' => '设置成功']);
     }
@@ -239,16 +277,21 @@ class ProductCategory extends Controller
      * @date      2025-12-18
      * 
      */
-    public function delete(Request $request, ProductCategoryModel $ProductCategoryModel,LowPriceGoodsModel $LowPriceGoodsModel,ViolationProductModel $ViolationProductModel)
+    public function delete(Request $request, ProductCategoryModel $ProductCategoryModel, LowPriceGoodsModel $LowPriceGoodsModel, ViolationProductModel $ViolationProductModel)
     {
         // 验证参数
         $request->scene('delete')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $id = request('id', 0);
         $product_where = ['category_id' => $id];
-        if ($is_admin != 1 && $company_id != 0) $product_where['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $product_where['company_id'] = $company_id;
+        } else {
+            $product_where['company_id'] = $admin_company_id;
+        }
         $low_price_goods_count = $LowPriceGoodsModel->where($product_where)->count();
         if ($low_price_goods_count > 0) {
             return json_send(['code' => 'error', 'msg' => '该分类下存在低价商品配置，删除失败']);
@@ -259,8 +302,12 @@ class ProductCategory extends Controller
         }
         // 查询用户
         $where = ['id' => $id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $where['company_id'] = $company_id;
+        } else {
+            $where['company_id'] = $admin_company_id;
+        }
         // 执行删除
-        if ($is_admin != 1 && $company_id != 0) $where['company_id'] = $company_id;
         $ProductCategory = $ProductCategoryModel->where($where)->first();
         if (!$ProductCategory) {
             return json_send(['code' => 'error', 'msg' => '记录不存在']);
@@ -272,7 +319,7 @@ class ProductCategory extends Controller
         $admin_id   = request('access_token.uid', 0); //用户ID
         $table_name = $ProductCategoryModel->getTable();
         $notes_type = 3; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-商品分类管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, $ProductCategory->toarray(), [], '删除了商品分类' . $ProductCategory->name . '信息');
+        $this->addAdminHistory('清洗配置-商品分类管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, $ProductCategory->toarray(), [], '删除了商品分类' . $ProductCategory->name . '信息');
         // 告知结果
         return             json_send(['code' => 'success', 'msg' => '删除成功']);
     }

app/Http/Controllers/Manager/WashConfig/ViolationProduct.php

@@ -30,8 +30,9 @@ class ViolationProduct extends Controller
     public function list(Request $request, ViolationProductModel $ViolationProductModel, ViolationStoreModel $ViolationStoreModel, ViolationProductCompanyModel $ViolationProductCompanyModel, ProductCategoryModel $ProductCategoryModel)
     {
         $request->scene('list')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 查询条件
         $map  = [];
         $limit = request('limit', config('page_num', 10));
@@ -54,7 +55,11 @@ class ViolationProduct extends Controller
         if ($company_scope) $map[] = ['company_scope', '=', $company_scope];
         if ($category_id) $map[] = ['category_id', '=', $category_id];
         // 查询数据
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $map[] = ['company_id', '=', $company_id];
+        } else {
+            $map[] = ['company_id', '=', $admin_company_id];
+        }
         $result = $ViolationProductModel->query()
             ->where($map)
             ->orderByDesc('id')
@@ -96,12 +101,17 @@ class ViolationProduct extends Controller
     public function detail(Request $request, ViolationProductModel $ViolationProductModel, ViolationProductCompanyModel $ViolationProductCompanyModel, ProductCategoryModel $ProductCategoryModel)
     {
         $request->scene('detail')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收参数
         $id = request('id', 0);
         $map = ['id' => $id];
-        if ($is_admin != 1 && $company_id != 0) $map['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $ViolationProductModel->where($map)->first();
         if (!$data)     return json_send(['code' => 'error', 'msg' => '记录不存在']);
         //查询店铺名称
@@ -134,13 +144,18 @@ class ViolationProduct extends Controller
      * @date      2025-12-03
      * 
      */
-    public function add(Request $request, ViolationProductModel $ViolationProductModel,LowPriceGoodsModel $LowPriceGoodsModel)
+    public function add(Request $request, ViolationProductModel $ViolationProductModel, LowPriceGoodsModel $LowPriceGoodsModel)
     {
         $request->scene('add')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         $status_where = ['status' => 0];
-        if ($is_admin != 1 && $company_id != 0) $status_where['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $status_where['company_id'] = $company_id;
+        } else {
+            $status_where['company_id'] = $admin_company_id;
+        }
         //获取禁止商品启动数量
         $violation_product_count = $ViolationProductModel->where($status_where)->count();
         //获取低价挂网商品启用数量
@@ -163,7 +178,11 @@ class ViolationProduct extends Controller
         $all_data['specify_responsible_person'] = $specify_responsible_person;
         //查询是否存在
         $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'], 'platform' => $all_data['platform']];
-        if ($is_admin != 1 && $company_id != 0) $map['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $ViolationProductModel->where($map)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 写入数据表
@@ -175,7 +194,7 @@ class ViolationProduct extends Controller
         $admin_id   = request('access_token.uid', 0); //用户ID
         $table_name = $ViolationProductModel->getTable();
         $notes_type = 1; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-禁止商品管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, [], $all_data, '新增了禁止商品' . $all_data['product_name'] . '信息');
+        $this->addAdminHistory('清洗配置-禁止商品管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, [], $all_data, '新增了禁止商品' . $all_data['product_name'] . '信息');
         // 告知结果
         return json_send(['code' => 'success', 'msg' => '新增成功']);
     }
@@ -190,8 +209,9 @@ class ViolationProduct extends Controller
     public function edit(Request $request, ViolationProductModel $ViolationProductModel)
     {
         $request->scene('edit')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收参数
         $id         = request('id', 0);
         // 接收数据
@@ -206,10 +226,20 @@ class ViolationProduct extends Controller
         $all_data['specify_responsible_person'] = $specify_responsible_person;
         //查询是否存在
         $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'], 'platform' => $all_data['platform']];
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $ViolationProductModel->where($map)->where('id', '!=', $id)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 更新数据表
         $where = ['id' => $id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $where['company_id'] = $company_id;
+        } else {
+            $where['company_id'] = $admin_company_id;
+        }
         $ViolationProduct = $ViolationProductModel->where($where)->first();
         if (!$ViolationProduct) return json_send(['code' => 'error', 'msg' => '记录不存在']);
         $oldData = $ViolationProduct->toarray();
@@ -220,7 +250,7 @@ class ViolationProduct extends Controller
         $admin_id   = request('access_token.uid', 0); //用户ID
         $table_name = $ViolationProductModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-禁止商品管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type,$oldData, $all_data, '修改了禁止商品' . $oldData['product_name'] . '信息');
+        $this->addAdminHistory('清洗配置-禁止商品管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, $oldData, $all_data, '修改了禁止商品' . $oldData['product_name'] . '信息');
         // 告知结果
         return json_send(['code' => 'success', 'msg' => '修改成功']);
     }
@@ -232,12 +262,13 @@ class ViolationProduct extends Controller
      * @date      2025-12-03
      * 
      */
-    public function set_status(Request $request, ViolationProductModel $ViolationProductModel,LowPriceGoodsModel $LowPriceGoodsModel)
+    public function set_status(Request $request, ViolationProductModel $ViolationProductModel, LowPriceGoodsModel $LowPriceGoodsModel)
     {
         // 验证参数
         $request->scene('set_status')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $id                = request('id', 0);
         $status            = request('status', 0);
@@ -255,6 +286,11 @@ class ViolationProduct extends Controller
         }
         // 查询用户
         $where = ['id' => $id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $where['company_id'] = $company_id;
+        } else {
+            $where['company_id'] = $admin_company_id;
+        }
         $ViolationProduct = $ViolationProductModel->where($where)->first();
         if (!$ViolationProduct) return json_send(['code' => 'error', 'msg' => '记录不存在']);
         // 执行修改
@@ -265,7 +301,7 @@ class ViolationProduct extends Controller
         $admin_id   = request('access_token.uid', 0); //用户ID
         $table_name = $ViolationProductModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-禁止商品管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type,[],['status'=> $status], '修改了禁止商品' . $ViolationProduct->product_name . '状态');
+        $this->addAdminHistory('清洗配置-禁止商品管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, [], ['status' => $status], '修改了禁止商品' . $ViolationProduct->product_name . '状态');
         // 告知结果
         return             json_send(['code' => 'success', 'msg' => '设置成功']);
     }
@@ -282,12 +318,18 @@ class ViolationProduct extends Controller
     {
         // 验证参数
         $request->scene('delete')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收数据
         $id = request('id', 0);
         // 查询用户
         $where = ['id' => $id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $where['company_id'] = $company_id;
+        } else {
+            $where['company_id'] = $admin_company_id;
+        }
         // 执行删除
         $ViolationProduct = $ViolationProductModel->where($where)->first();
         if (!$ViolationProduct) {
@@ -306,7 +348,7 @@ class ViolationProduct extends Controller
             $admin_id   = request('access_token.uid', 0); //用户ID
             $table_name = $ViolationProductModel->getTable();
             $notes_type = 3; //操作类型，1添加，2修改，3=删除
-            $this->addAdminHistory('清洗配置-禁止商品管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type,$ViolationProduct_log, [], '删除了禁止商品' . $ViolationProduct_log['product_name'] . '信息');
+            $this->addAdminHistory('清洗配置-禁止商品管理', $company_id, $admin_id, $is_admin, $table_name, $notes_type, $ViolationProduct_log, [], '删除了禁止商品' . $ViolationProduct_log['product_name'] . '信息');
             // 告知结果
             DB::commit();
             return             json_send(['code' => 'success', 'msg' => '删除成功']);
@@ -314,7 +356,7 @@ class ViolationProduct extends Controller
         } catch (\Exception $e) {
             DB::rollBack();
             // 错误处理...
-            return             json_send(['code' => 'error', 'msg' => '删除失败','data' => $e->getMessage(),'k'=>$ViolationProduct_log]);
+            return             json_send(['code' => 'error', 'msg' => '删除失败', 'data' => $e->getMessage(), 'k' => $ViolationProduct_log]);
         }
     }
 }

app/Http/Controllers/Manager/WashConfig/ViolationStore.php

@@ -29,6 +29,7 @@ class ViolationStore extends Controller
     public function list(Request $request, ViolationStoreModel $ViolationStoreModel, EmployeeModel $EmployeeModel, CompanyCategoryModel $CompanyCategoryModel, CitysModel $CitysModel)
     {
         $request->scene('list')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 查询条件
@@ -53,7 +54,11 @@ class ViolationStore extends Controller
         if ($store_type) $map[] = ['store_type', '=', $store_type];
         if ($category_id) $map[] = ['category_id', '=', $category_id];
         // 查询数据
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0){
+             $map[] = ['company_id', '=', $company_id];
+        }else{
+            $map[] = ['company_id', '=', $admin_company_id];
+        }
         $result = $ViolationStoreModel->query()
             ->where($map)
             ->orderByDesc('id')
@@ -87,6 +92,7 @@ class ViolationStore extends Controller
     public function all(Request $request, ViolationStoreModel $ViolationStoreModel)
     {
         $request->scene('all')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 查询条件
@@ -108,7 +114,11 @@ class ViolationStore extends Controller
         if ($store_name) $map[] = ['store_name', 'like', "%$store_name%"];
         if ($category_id) $map[] = ['category_id', '=', $category_id];
         // 查询数据
-        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
+        if ($is_admin != 1 && $company_id != 0){
+             $map[] = ['company_id', '=', $company_id];
+        }else{
+            $map[] = ['company_id', '=', $admin_company_id];
+        }
         $result = $ViolationStoreModel->query()
             ->where($map)
             ->orderByDesc('id')
@@ -128,12 +138,17 @@ class ViolationStore extends Controller
     public function detail(Request $request, ViolationStoreModel $ViolationStoreModel, EmployeeModel $EmployeeModel, CompanyCategoryModel $CompanyCategoryModel, CitysModel $CitysModel)
     {
         $request->scene('detail')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收参数
         $id = request('id', 0);
         $map = ['id' => $id];
-        if ($is_admin != 1 && $company_id != 0) $map['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $ViolationStoreModel->where($map)->first();
         if (!$data)     return json_send(['code' => 'error', 'msg' => '记录不存在']);
         $employee_ids = $data->employee_ids != '' ? explode(',', $data->employee_ids) : '';
@@ -159,6 +174,7 @@ class ViolationStore extends Controller
     public function add(Request $request, ViolationStoreModel $ViolationStoreModel)
     {
         $request->scene('add')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收数据
@@ -177,7 +193,11 @@ class ViolationStore extends Controller
         $all_data['platform'] = $platform;
         //查询是否存在
         $map = ['social_credit_code' => $all_data['social_credit_code']];
-        if ($is_admin != 1 && $company_id != 0) $map['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $ViolationStoreModel->where($map)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '营业执照记录已存在']);
         // 写入数据表
@@ -204,6 +224,7 @@ class ViolationStore extends Controller
     public function edit(Request $request, ViolationStoreModel $ViolationStoreModel)
     {
         $request->scene('edit')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收参数
@@ -224,12 +245,20 @@ class ViolationStore extends Controller
         $all_data['platform'] = $platform;
         //查询是否存在
         $map = ['social_credit_code' => $all_data['social_credit_code']];
-        if ($is_admin != 1 && $company_id != 0) $map['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $map['company_id'] = $company_id;
+        } else {
+            $map['company_id'] = $admin_company_id;
+        }
         $data = $ViolationStoreModel->where($map)->where('id', '!=', $id)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 更新数据表
         $where = ['id' => $id];
-        if ($is_admin != 1 && $company_id != 0) $where['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $where['company_id'] = $company_id;
+        } else {
+            $where['company_id'] = $admin_company_id;
+        }
         $ViolationStore = $ViolationStoreModel->where($where)->first();
         if (!$ViolationStore) return json_send(['code' => 'error', 'msg' => '记录不存在']);
         $oldData = $ViolationStore->toarray();
@@ -257,6 +286,7 @@ class ViolationStore extends Controller
     {
         // 验证参数
         $request->scene('set_status')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收数据
@@ -264,7 +294,11 @@ class ViolationStore extends Controller
         $status            = request('status', 0);
         // 查询用户
         $where = ['id' => $id];
-        if ($is_admin != 1 && $company_id != 0) $where['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $where['company_id'] = $company_id;
+        } else {
+            $where['company_id'] = $admin_company_id;
+        }
         $ViolationStore = $ViolationStoreModel->where($where)->first();
         if (!$ViolationStore) return json_send(['code' => 'error', 'msg' => '记录不存在']);
         // 执行修改
@@ -292,12 +326,17 @@ class ViolationStore extends Controller
     {
         // 验证参数
         $request->scene('delete')->validate();
+        $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0');
         // 接收数据
         $id = request('id', 0);
         $company_where = ['company_id' => $id];
-        if ($is_admin != 1 && $company_id != 0) $where['company_id'] = $company_id;
+        if ($is_admin != 1 && $company_id != 0) {
+            $company_where['company_id'] = $company_id;
+        } else {
+            $company_where['company_id'] = $admin_company_id;
+        }
         //查询是否已经被使用
         $use_low_price_goods_company_log = $LowPriceGoodsCompanyModel->where($company_where)->first();
         if ($use_low_price_goods_company_log) {
@@ -309,6 +348,11 @@ class ViolationStore extends Controller
         }
         // 查询用户
         $where = ['id' => $id];
+        if ($is_admin != 1 && $company_id != 0) {
+            $where['company_id'] = $company_id;
+        } else {
+            $where['company_id'] = $admin_company_id;
+        }
         // 执行删除
         $ViolationStore = $ViolationStoreModel->where($where)->first();
         if (!$ViolationStore) return json_send(['code' => 'error', 'msg' => '记录不存在']);