【智价云】 部门/员工/角色数据隔离（按公司划分）、登录&采集配置增加公司归属、（人员管理&清洗配置&违规处理）记录日志增加公司归属

app/Http/Controllers/Controller.php

@@ -54,11 +54,11 @@ class Controller extends BaseController
      * @param   String       $general_description    操作描述
      *
      */
-    protected function addAdminHistory($admin_menu_name, $uid, $is_admin, $table, $type, $oldData, $newData, $general_description = '')
+    protected function addAdminHistory($admin_menu_name,$company_id, $uid, $is_admin, $table, $type, $oldData, $newData, $general_description = '')
     {
         //记录详细操作历史
         $AdminHistory            = (new AdminHistory());
         // 记录数据
-        $AdminHistory->addAll($admin_menu_name, $uid, $is_admin, $table, $type, $oldData, $newData, $general_description);
+        $AdminHistory->addAll($admin_menu_name,$company_id, $uid, $is_admin, $table, $type, $oldData, $newData, $general_description);
     }
 }

app/Http/Controllers/Manager/AdminHistory.php

@@ -26,6 +26,8 @@ class AdminHistory extends Controller
     public function list(Request $request, AdminHistoryModel $AdminHistoryModel, AdminUserModel $AdminUserModel, EmployeeModel $EmployeeModel)
     {
         $request->scene('list')->validate();
+        $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));

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

@@ -26,6 +26,8 @@ class Product extends Controller
     public function list(Request $request, ProductModel $ProductModel)
     {
         $request->scene('list')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');
         // 查询条件
         $map  = [];
         $limit = request('limit', config('page_num', 10));
@@ -41,6 +43,8 @@ class Product extends Controller
         if (is_numeric($status)) $map[] = ['status', '=', $status];
         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];
         // 查询数据
         $result = $ProductModel->query()
             ->where($map)
@@ -66,9 +70,13 @@ class Product extends Controller
     public function detail(Request $request, ProductModel $ProductModel)
     {
         $request->scene('detail')->validate();
+        $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];
         $data = $ProductModel->where($map)->first();
         if (!$data)     return json_send(['code' => 'error', 'msg' => '记录不存在']);
 
@@ -87,6 +95,8 @@ class Product extends Controller
     public function add(Request $request, ProductModel $ProductModel)
     {
         $request->scene('add')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         //商品启用数量
         // $product_count = $ProductModel->where('status', 0)->count();
         //判断是否超过限制
@@ -108,18 +118,19 @@ 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];
         $data = $ProductModel->where($map)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 写入数据表
+        $all_data['company_id'] = $company_id;
         $result     =  $ProductModel->addProduct($all_data);
         // 如果操作失败
         if (!$result)     return json_send(['code' => 'error', 'msg' => '新增失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $ProductModel->getTable();
         $notes_type = 1; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('采集配置-商品管理', $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' => '新增成功']);
     }
@@ -134,6 +145,8 @@ class Product extends Controller
     public function edit(Request $request, ProductModel $ProductModel)
     {
         $request->scene('edit')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收参数
         $id         = request('id', 0);
         // 接收数据
@@ -149,10 +162,12 @@ 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];
         $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];
         $Product = $ProductModel->where($where)->first();
         if (!$Product) return json_send(['code' => 'error', 'msg' => '记录不存在']);
         $oldData = $Product->toarray();
@@ -163,10 +178,9 @@ class Product extends Controller
         if (!$result)     return json_send(['code' => 'error', 'msg' => '修改失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $ProductModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('采集配置-商品管理', $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' => '修改成功']);
     }
@@ -182,6 +196,8 @@ class Product extends Controller
     {
         // 验证参数
         $request->scene('set_status')->validate();
+        $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);
@@ -195,6 +211,7 @@ class Product extends Controller
         }
         // 查询用户
         $where = ['id' => $id];
+        if ($is_admin != 1 && $company_id != 0) $where[] = ['company_id', '=', $company_id];
         $Product = $ProductModel->where($where)->first();
         if (!$Product) return json_send(['code' => 'error', 'msg' => '记录不存在']);
         // 执行修改
@@ -203,10 +220,9 @@ class Product extends Controller
         if (!$result)    return json_send(['code' => 'error', 'msg' => '设置失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $ProductModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('采集配置-商品管理', $admin_id, $is_admin, $table_name, $notes_type, [], ['status' => $status], '修改了商品' . $Product->product_name . '状态');
+        $this->addAdminHistory('采集配置-商品管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, [], ['status' => $status], '修改了商品' . $Product->product_name . '状态');
         // 告知结果
         return             json_send(['code' => 'success', 'msg' => '设置成功']);
     }
@@ -223,10 +239,13 @@ class Product extends Controller
     {
         // 验证参数
         $request->scene('delete')->validate();
+        $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];
         // 执行删除
         $Product = $ProductModel->where($where)->first();
         if (!$Product) {
@@ -237,10 +256,9 @@ class Product extends Controller
             $Product->delete();
             // 记录行为
             $admin_id   = request('access_token.uid', 0); //用户ID
-            $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
             $table_name = $ProductModel->getTable();
             $notes_type = 3; //操作类型，1添加，2修改，3=删除
-            $this->addAdminHistory('采集配置-商品管理', $admin_id, $is_admin, $table_name, $notes_type, $Product->toarray(), [], '删除了商品' . $Product->product_name . '信息');
+            $this->addAdminHistory('采集配置-商品管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, $Product->toarray(), [], '删除了商品' . $Product->product_name . '信息');
             // 告知结果
             DB::commit();
             return             json_send(['code' => 'success', 'msg' => '删除成功']);

app/Http/Controllers/Manager/Login.php

@@ -58,7 +58,7 @@ class Login extends Manager
 			$accessToken['username']			= $admin['username'];
 			// 获取权限列表
 		} else {
-			$admin    	= $EmployeeModel->where('employee_code', $username)->first(['id as uid', 'name as username', 'mobile as phone', 'status', 'password', 'insert_time', 'update_time']);
+			$admin    	= $EmployeeModel->where('employee_code', $username)->first(['company_id','company_id','id as uid', 'name as username', 'mobile as phone', 'status', 'password', 'insert_time', 'update_time']);
 			// 用户不存在
 			if (!$admin)	return json_send(['code' => 'error', 'msg' => '密码错误或账号不存在']);
 			// 用户不存在
@@ -68,7 +68,7 @@ class Login extends Manager
 			// 比对密码
 			if (md5($password) != $admin['password']) return json_send(['code' => 'error', 'msg' => '密码错误或账号不存在']);
 			// 登录
-			$accessToken 						= $EmployeeModel->Login($admin['uid'], 'manager');
+			$accessToken 						= $EmployeeModel->Login($admin['uid'],$admin['company_id'], 'manager');
 			// 比对密码
 			if (isset($accessToken['error'])) 	return json_send(['code' => 'error', 'msg' => '登录失败', 'data' => $accessToken['data']]);
 			// 获取权限列表
@@ -151,7 +151,7 @@ class Login extends Manager
 		// 接收数据
 		$password    = $Request->input('password', '');
 		// 查询用户
-		$admin    	= $EmployeeModel->where('mobile', $phone)->first(['id as uid', 'name as username', 'mobile as phone', 'status', 'password', 'insert_time', 'update_time']);
+		$admin    	= $EmployeeModel->where('mobile', $phone)->first(['company_id','id as uid', 'name as username', 'mobile as phone', 'status', 'password', 'insert_time', 'update_time']);
 		// 用户不存在
 		if (!$admin)	return json_send(['code' => 'error', 'msg' => '密码错误或账号不存在']);
 		// 用户不存在
@@ -161,7 +161,7 @@ class Login extends Manager
 		// 比对密码
 		if (md5($password) != $admin['password']) return json_send(['code' => 'error', 'msg' => '密码错误或账号不存在']);
 		// 登录
-		$accessToken 						= $EmployeeModel->Login($admin['uid'], 'manager');
+		$accessToken 						= $EmployeeModel->Login($admin['uid'],$admin['company_id'], 'manager');
 		// 比对密码
 		if (isset($accessToken['error'])) 	return json_send(['code' => 'error', 'msg' => '登录失败', 'data' => $accessToken['data']]);
 		// 获取权限列表
@@ -218,7 +218,7 @@ class Login extends Manager
 		// 接收数据
 		$password    = $Request->input('password', '');
 		// 查询用户
-		$admin    	= $EmployeeModel->where('email', $email)->first(['id as uid', 'name as username', 'mobile as phone', 'status', 'password', 'insert_time', 'update_time']);
+		$admin    	= $EmployeeModel->where('email', $email)->first(['company_id','company_id','id as uid', 'name as username', 'mobile as phone', 'status', 'password', 'insert_time', 'update_time']);
 		// 用户不存在
 		if (!$admin)	return json_send(['code' => 'error', 'msg' => '密码错误或账号不存在']);
 		// 用户不存在
@@ -228,7 +228,7 @@ class Login extends Manager
 		// 比对密码
 		if (md5($password) != $admin['password']) return json_send(['code' => 'error', 'msg' => '密码错误或账号不存在']);
 		// 登录
-		$accessToken 						= $EmployeeModel->Login($admin['uid'], 'manager');
+		$accessToken 						= $EmployeeModel->Login($admin['uid'],$admin['company_id'], 'manager');
 		// 比对密码
 		if (isset($accessToken['error'])) 	return json_send(['code' => 'error', 'msg' => '登录失败', 'data' => $accessToken['data']]);
 		// 获取权限列表
@@ -259,7 +259,7 @@ class Login extends Manager
 		if (!$session)                     return json_send(['code' => 'error', 'msg' => '请先获取手机号验证码']);
 		if ($session['code'] != $code || $session['phone'] != $phone) return json_send(['code' => 'error', 'msg' => '验证码错误']);
 		// 查询用户
-		$admin    	= $EmployeeModel->where('mobile', $phone)->first(['id as uid', 'name as username', 'mobile as phone', 'status', 'password', 'insert_time', 'update_time']);
+		$admin    	= $EmployeeModel->where('mobile', $phone)->first(['company_id','id as uid', 'name as username', 'mobile as phone', 'status', 'password', 'insert_time', 'update_time']);
 		// 用户不存在
 		if (!$admin)	return json_send(['code' => 'error', 'msg' => '账号不存在']);
 		// 用户不存在
@@ -267,7 +267,7 @@ class Login extends Manager
 		// 转数组
 		$admin    	= $admin->toArray();
 		// 登录
-		$accessToken 						= $EmployeeModel->Login($admin['uid'], 'manager');
+		$accessToken 						= $EmployeeModel->Login($admin['uid'],$admin['company_id'], 'manager');
 		// 比对密码
 		if (isset($accessToken['error'])) 	return json_send(['code' => 'error', 'msg' => '登录失败', 'data' => $accessToken['data']]);
 		// 获取权限列表
@@ -297,7 +297,7 @@ class Login extends Manager
 		$user_open_data = $EmployeeOpenidModel->where(['openid' => $tokenData['openid']])->first();
 		if (!$user_open_data)   return json_send(['code' => 'error', 'msg' => '未绑定账号，请登录后在绑定']);
 		// 查询用户
-		$admin    	= $EmployeeModel->where('id', $user_open_data->employee_id)->first(['id as uid', 'name as username', 'mobile as phone', 'status', 'password', 'insert_time', 'update_time']);
+		$admin    	= $EmployeeModel->where('id', $user_open_data->employee_id)->first(['company_id','company_id','id as uid', 'name as username', 'mobile as phone', 'status', 'password', 'insert_time', 'update_time']);
 		// 用户不存在
 		if (!$admin)	return json_send(['code' => 'error', 'msg' => '账号不存在']);
 		// 用户不存在
@@ -305,7 +305,7 @@ class Login extends Manager
 		// 转数组
 		$admin    	= $admin->toArray();
 		// 登录
-		$accessToken 						= $EmployeeModel->Login($admin['uid'], 'manager');
+		$accessToken 						= $EmployeeModel->Login($admin['uid'],$admin['company_id'], 'manager');
 		// 比对密码
 		if (isset($accessToken['error'])) 	return json_send(['code' => 'error', 'msg' => '登录失败', 'data' => $accessToken['data']]);
 		// 获取权限列表

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

@@ -5,7 +5,6 @@ namespace App\Http\Controllers\Manager\Personnel;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Manager\Personnel\Department as Request;
 use App\Models\Manager\Personnel\Department as DepartmentModel;
-use App\Models\Manager\Personnel\Employee as EmployeeModel;
 use App\Models\Manager\Personnel\EmployeeDepartment as EmployeeDepartmentModel;
 
 
@@ -27,6 +26,8 @@ class Department extends Controller
     public function list(Request $request, DepartmentModel $DepartmentModel)
     {
         $request->scene('list')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');
         // 查询条件
         $map  = [];
         $limit = request('limit', config('page_num', 10));
@@ -34,6 +35,8 @@ 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)];
@@ -61,10 +64,14 @@ class Department extends Controller
     public function all(DepartmentModel $DepartmentModel)
     {
         $map  = [];
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');
         $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 ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
@@ -90,8 +97,12 @@ class Department extends Controller
     public function detail(Request $request, DepartmentModel $DepartmentModel)
     {
         $request->scene('detail')->validate();
+        $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];
         $data = $DepartmentModel->where($map)->first();
         if (!$data)     return json_send(['code' => 'error', 'msg' => '记录不存在']);
@@ -109,12 +120,16 @@ class Department extends Controller
     public function add(Request $request, DepartmentModel $DepartmentModel)
     {
         $request->scene('add')->validate();
+        $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', '');
         $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;
         $data = $DepartmentModel->where($map)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 写入数据表
@@ -126,7 +141,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('人员信息管理-部门管理', $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' => '新增成功']);
     }
@@ -141,6 +156,8 @@ class Department extends Controller
     public function edit(Request $request, DepartmentModel $DepartmentModel)
     {
         $request->scene('edit')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收参数
         $id         = request('id', 0);
         // 接收数据
@@ -148,11 +165,14 @@ class Department extends Controller
         $store_scope = request('store_scope', '');
         $all_data['store_scope'] = $store_scope;
         $where = ['id' => $id];
+        // 权限判断
+        if ($is_admin != 1 && $company_id != 0) $where[] = ['company_id', '=', $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];
         $data = $DepartmentModel->where($map)->where('id', '!=', $id)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 更新数据表
@@ -161,10 +181,9 @@ class Department extends Controller
         if (!$result)     return json_send(['code' => 'error', 'msg' => '修改失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $DepartmentModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('人员信息管理-部门管理', $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' => '修改成功']);
     }
@@ -180,20 +199,26 @@ class Department extends Controller
     {
         // 验证参数
         $request->scene('set_status')->validate();
+        $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);
+        // 查询用户
+        $where = ['id' => $id];
+        // 权限判断
+        if ($is_admin != 1 && $company_id != 0) $where[] = ['company_id', '=', $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];
             $data = $EmployeeDepartmentModel->where($map)->first();
             if ($data)     return json_send(['code' => 'error', 'msg' => '该部门下存在员工，不能禁用']);
         }
-        // 查询用户
-        $where = ['id' => $id];
-        // 执行修改
-        $Department = $DepartmentModel->where($where)->first();
-        if (!$Department) return json_send(['code' => 'error', 'msg' => '记录不存在']);
+
         $Department->status = $status;
         $Department->update_time = time();
         $result = $Department->save();
@@ -201,10 +226,9 @@ class Department extends Controller
         if (!$result)    return json_send(['code' => 'error', 'msg' => '设置失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $DepartmentModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('人员信息管理-部门管理', $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' => '设置成功']);
     }
@@ -221,27 +245,31 @@ class Department extends Controller
     {
         // 验证参数
         $request->scene('delete')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收数据
         $id = request('id', 0);
-        // 查询部门下是否有员工
-        $map = ['department_id' => $id];
-        $data = $EmployeeDepartmentModel->where($map)->first();
-        if ($data)     return json_send(['code' => 'error', 'msg' => '该部门下存在员工，不能删除']);
         // 查询用户
         $where = ['id' => $id];
+        if ($is_admin != 1 && $company_id != 0) $where[] = ['company_id', '=', $company_id];
         $Department = $DepartmentModel->where($where)->first();
         if (!$Department) {
             return json_send(['code' => 'error', 'msg' => '记录不存在']);
         }
+        // 查询部门下是否有员工
+        $map = ['department_id' => $id];
+        // 权限判断
+        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
+        $data = $EmployeeDepartmentModel->where($map)->first();
+        if ($data)     return json_send(['code' => 'error', 'msg' => '该部门下存在员工，不能删除']);
         $result = $Department->delete();
         // 提示删除失败
         if (!$result)    return json_send(['code' => 'error', 'msg' => '删除失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $DepartmentModel->getTable();
         $notes_type = 3; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('人员信息管理-部门管理', $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,8 @@ 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();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');
         // 查询条件
         $map  = [];
         $limit = request('limit', config('page_num', 10));
@@ -57,12 +59,16 @@ class Employee extends Controller
         if ($employee_code) $map[] = ['employee_code', 'like', "%$employee_code%"];
         if ($city_id) $map[] = ['city_ids', 'like', "%,$city_id,%"];
         if ($role_name) {
-            $role_ids = $RolesModel->where('name', 'like', "%$role_name%")->pluck('id')->toarray();
+            $role_where = [['name', 'like', "%$role_name%"]];
+            if ($is_admin != 1 && $company_id != 0) $role_where[] = ['company_id', '=', $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 ($role_name) {
-            $EmployeeModel = $EmployeeModel->whereIn('role_id', $role_ids);
+        if (count($role_ids) > 0) {
+            $employee_where = [];
+            if ($is_admin != 1 && $company_id != 0) $employee_where[] = ['company_id', '=', $company_id];
+            $EmployeeModel = $EmployeeModel->whereIn('role_id', $role_ids)->where($employee_where);
         }
         //多选查询地区
         if ($city_ids && is_string($city_ids)) {
@@ -75,11 +81,14 @@ class Employee extends Controller
         //多选部门查询
         if ($department_ids && is_string($department_ids)) {
             $department_ids =  explode(',', $department_ids);
-            $subQuery = $EmployeeDepartmentModel->whereIn('department_id', $department_ids)->distinct('employee_id')->select('employee_id');
+            $employee_department_where = [];
+            if ($is_admin != 1 && $company_id != 0) $employee_department_where[] = ['company_id', '=', $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];
         $result = $EmployeeModel
             ->where($map)
             ->select($field)
@@ -100,7 +109,7 @@ class Employee extends Controller
                 if (count($city_ids) > 0) {
                     $city_info = $CitysModel->whereIn('id', $city_ids)->pluck('name');
                 }
-                $result['data'][$key]['department_ids'] = $value['department_ids'] != '' ? substr($value['department_ids'], 1, strlen($value['department_ids']) -2):'';
+                $result['data'][$key]['department_ids'] = $value['department_ids'] != '' ? substr($value['department_ids'], 1, strlen($value['department_ids']) - 2) : '';
                 $result['data'][$key]['department_name'] = $department_name;
                 $result['data'][$key]['role_name'] = isset($role_info['name']) ? $role_info['name'] : '';
                 $result['data'][$key]['city_info'] = $city_info;
@@ -120,6 +129,8 @@ class Employee extends Controller
     public function all(Request $request, EmployeeModel $EmployeeModel, RolesModel $RolesModel, EmployeeAreaModel $EmployeeAreaModel, EmployeeDepartmentModel $EmployeeDepartmentModel)
     {
         $request->scene('all')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');
         // 查询条件
         $map  = [];
         $limit = request('limit', config('page_num', 10));
@@ -147,13 +158,18 @@ class Employee extends Controller
         if (is_numeric($open_notice)) $map[] = ['open_notice', '=', $open_notice];
         if ($employee_code) $map[] = ['employee_code', 'like', "%$employee_code%"];
         if ($city_id) $map[] = ['city_ids', 'like', "%,$city_id,%"];
+        // 权限判断
         if ($role_name) {
-            $role_ids = $RolesModel->where('name', 'like', "%$role_name%")->pluck('id')->toarray();
+             $role_where = [['name', 'like', "%$role_name%"]];
+            if ($is_admin != 1 && $company_id != 0) $role_where[] = ['company_id', '=', $company_id];
+            $role_ids = $RolesModel->where($role_where)->pluck('id')->toarray();
         }
         $field = ['id', 'name'];
         // 查询数据
-        if ($role_name) {
-            $EmployeeModel = $EmployeeModel->whereIn('role_id', $role_ids);
+        if (count($role_ids) > 0) {
+             $employee_where = [];
+            if ($is_admin != 1 && $company_id != 0) $employee_where[] = ['company_id', '=', $company_id];
+            $EmployeeModel = $EmployeeModel->whereIn('role_id', $role_ids)->where($employee_where);
         }
         //多选查询地区
         if ($city_ids && is_string($city_ids)) {
@@ -166,11 +182,14 @@ class Employee extends Controller
         //多选部门查询
         if ($department_ids && is_string($department_ids)) {
             $department_ids =  explode(',', $department_ids);
-            $subQuery = $EmployeeDepartmentModel->whereIn('department_id', $department_ids)->distinct('employee_id')->select('employee_id');
+            $employee_department_where = [];
+            if ($is_admin != 1 && $company_id != 0) $employee_department_where[] = ['company_id', '=', $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];
         $result = $EmployeeModel
             ->where($map)
             ->select($field)
@@ -191,9 +210,13 @@ class Employee extends Controller
     public function detail(Request $request, EmployeeModel $EmployeeModel, DepartmentModel $DepartmentModel, RolesModel $RolesModel, CitysModel $CitysModel)
     {
         $request->scene('detail')->validate();
+        $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];
         $field = ['id', 'employee_code', 'name', 'mobile', 'department_ids', 'duty_type', 'role_id', 'city_ids', 'open_notice', 'insert_time', 'update_time', 'status'];
         $data = $EmployeeModel->where($map)->select($field)->first();
         if (!$data)     return json_send(['code' => 'error', 'msg' => '记录不存在']);
@@ -209,7 +232,7 @@ class Employee extends Controller
             $city_info = $CitysModel->whereIn('id', $city_ids)->pluck('name');
         }
         //截取字符串
-        $data['department_ids'] = $data['department_ids'] !='' ? substr($data['department_ids'], 1, strlen($data['department_ids']) -2) : '';
+        $data['department_ids'] = $data['department_ids'] != '' ? substr($data['department_ids'], 1, strlen($data['department_ids']) - 2) : '';
         $data['department_name'] = isset($department_info) ? array_column($department_info, 'name') : '';
         $data['role_name'] = isset($role_info['name']) ? $role_info['name'] : '';
         $data['city_info'] = $city_info;
@@ -227,8 +250,11 @@ class Employee extends Controller
     public function add(Request $request, EmployeeModel $EmployeeModel)
     {
         $request->scene('add')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收数据
         $all_data = request()->all();
+        $user_company_id = request('access_token.company_id', '0');
         $email = request('email', '');
         $all_data['email'] = $email;
         //查询是否存在
@@ -237,6 +263,9 @@ 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;
         $data = $EmployeeModel->where($map)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '员工姓名记录已存在']);
         $map = ['mobile' => $all_data['mobile']];
@@ -248,10 +277,9 @@ class Employee extends Controller
         if (!$result)     return json_send(['code' => 'error', 'msg' => '新增失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $EmployeeModel->getTable();
         $notes_type = 1; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('人员信息管理-员工管理', $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' => '新增成功']);
     }
@@ -266,6 +294,8 @@ class Employee extends Controller
     public function edit(Request $request, EmployeeModel $EmployeeModel)
     {
         $request->scene('edit')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收参数
         $id         = request('id', 0);
         // 接收数据
@@ -278,14 +308,18 @@ class Employee extends Controller
         $all_data['city_ids'] = $city_ids;
         $all_data['password'] = request('password', '');
         $where = ['id' => $id];
+        // 权限判断
+        if ($is_admin != 1 && $company_id != 0) $where[] = ['company_id', '=', $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];
         $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];
         $data = $EmployeeModel->where($map)->where('id', '!=', $id)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '员工手机号记录已存在']);
         // 更新数据表
@@ -294,10 +328,9 @@ class Employee extends Controller
         if (!$result)     return json_send(['code' => 'error', 'msg' => '修改失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $EmployeeModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('人员信息管理-员工管理', $admin_id, $is_admin, $table_name, $notes_type,$oldData, $all_data, '修改了员工' .$oldData['name'] . '信息');
+        $this->addAdminHistory('人员信息管理-员工管理', $admin_id, $is_admin, $table_name, $notes_type, $oldData, $all_data, '修改了员工' . $oldData['name'] . '信息');
         // 告知结果
         return json_send(['code' => 'success', 'msg' => '修改成功']);
     }
@@ -313,19 +346,22 @@ class Employee extends Controller
     {
         // 验证参数
         $request->scene('set_status')->validate();
+        $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);
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin');//是否管理员操作 0=是1=否
         // 查询用户
         $where = ['id' => $id];
+        // 权限判断
+        if ($is_admin != 1 && $company_id != 0) $where[] = ['company_id', '=', $company_id];
         // 执行修改
         $Employee = $EmployeeModel->where($where)->first();
         if (!$Employee) {
             return json_send(['code' => 'error', 'msg' => '记录不存在']);
         }
-        if($is_admin == 1 && $admin_id == $Employee->id){
+        if ($is_admin == 1 && $admin_id == $Employee->id) {
             return json_send(['code' => 'error', 'msg' => '不能修改自己的状态']);
         }
         $Employee->status = $status;
@@ -336,7 +372,7 @@ class Employee extends Controller
         // 记录行为
         $table_name = $EmployeeModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('人员信息管理-员工管理', $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' => '设置成功']);
     }
@@ -353,18 +389,23 @@ class Employee extends Controller
     {
         // 验证参数
         $request->scene('delete')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收数据
         $id = request('id', 0);
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin');//是否管理员操作 0=是1=否
         // 查询用户
         $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];
         // 执行删除
         $Employee = $EmployeeModel->where($where)->first();
         if (!$Employee) {
             return json_send(['code' => 'error', 'msg' => '记录不存在']);
         }
-        if($is_admin == 1 && $admin_id == $Employee->id){
+        if ($is_admin == 1 && $admin_id == $Employee->id) {
             return json_send(['code' => 'error', 'msg' => '不能删除自己']);
         }
         $result = $Employee->delete();

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

@@ -23,9 +23,11 @@ class Roles extends Controller
      * @date      2025-12-05
      * 
      */
-    public function list(Request $request, RolesModel $RolesModel,RolesAuthRuleModel $RolesAuthRuleModel)
+    public function list(Request $request, RolesModel $RolesModel, RolesAuthRuleModel $RolesAuthRuleModel)
     {
         $request->scene('list')->validate();
+        $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));
@@ -33,6 +35,8 @@ class Roles 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)];
@@ -48,7 +52,7 @@ class Roles extends Controller
         if (!$result)  return json_send(['code' => 'success', 'msg' => '获取成功', 'data' => []]);
         foreach ($result['data'] as $key => $value) {
             $menu_ids = $RolesAuthRuleModel->where('role_id', $value['id'])->get(['menu_id'])->toArray();
-            $result['data'][$key]['menu_ids'] = !empty($menu_ids)? array_column($menu_ids,'menu_id') : [];
+            $result['data'][$key]['menu_ids'] = !empty($menu_ids) ? array_column($menu_ids, 'menu_id') : [];
         }
         // 加载模板
         return        json_send(['code' => 'success', 'msg' => '获取成功', 'data' => $result]);
@@ -64,10 +68,14 @@ class Roles extends Controller
     public function all(RolesModel $RolesModel)
     {
         $map  = [];
+        $company_id = request('access_token.company_id', '0');
+        $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 ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
@@ -91,16 +99,20 @@ class Roles extends Controller
      * @version   1.0
      * @date      2025-12-05
      */
-    public function detail(Request $request, RolesModel $RolesModel,RolesAuthRuleModel $RolesAuthRuleModel)
+    public function detail(Request $request, RolesModel $RolesModel, RolesAuthRuleModel $RolesAuthRuleModel)
     {
         $request->scene('detail')->validate();
+        $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];
         $data = $RolesModel->where($map)->first();
         if (!$data)     return json_send(['code' => 'error', 'msg' => '记录不存在']);
         $menu_ids = $RolesAuthRuleModel->where('role_id', $id)->get(['menu_id'])->toArray();
-        $data->menu_ids = !empty($menu_ids)? array_column($menu_ids,'menu_id') : [];
+        $data->menu_ids = !empty($menu_ids) ? array_column($menu_ids, 'menu_id') : [];
         // 加载模板
         return json_send(['code' => 'success', 'msg' => '获取成功', 'data' => $data]);
     }
@@ -115,6 +127,8 @@ class Roles extends Controller
     public function add(Request $request, RolesModel $RolesModel)
     {
         $request->scene('add')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收数据
         $all_data = request()->all();
         $menu_ids = request('menu_ids', '');
@@ -123,6 +137,9 @@ class Roles extends Controller
         $all_data['menu_ids'] = $menu_ids;
         //查询是否存在
         $map = ['name' => $all_data['name']];
+        // 权限判断
+        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $company_id];
+        $all_data['company_id'] = $company_id;
         $data = $RolesModel->where($map)->first();
         if ($data)     return json_send(['code' => 'error', 'msg' => '记录已存在']);
         // 写入数据表
@@ -131,10 +148,9 @@ class Roles extends Controller
         if (!$result)     return json_send(['code' => 'error', 'msg' => '新增失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $RolesModel->getTable();
         $notes_type = 1; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('人员信息管理-角色管理', $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' => '新增成功']);
     }
@@ -149,6 +165,8 @@ class Roles extends Controller
     public function edit(Request $request, RolesModel $RolesModel)
     {
         $request->scene('edit')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收参数
         $id         = request('id', 0);
         $menu_ids = request('menu_ids', '');
@@ -158,10 +176,13 @@ class Roles extends Controller
         $all_data['menu_ids'] = $menu_ids;
         //查询是否存在
         $map = ['name' => $all_data['name']];
+        // 权限判断
+        if ($is_admin != 1 && $company_id != 0) $map[] = ['company_id', '=', $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];
         $Roles = $RolesModel->where($where)->first();
         if (!$Roles) return json_send(['code' => 'error', 'msg' => '记录不存在']);
         $oldData = $Roles->toArray();
@@ -170,10 +191,9 @@ class Roles extends Controller
         if (!$result)     return json_send(['code' => 'error', 'msg' => '修改失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $RolesModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('人员信息管理-角色管理', $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' => '修改成功']);
     }
@@ -189,17 +209,22 @@ class Roles extends Controller
     {
         // 验证参数
         $request->scene('set_status')->validate();
+        $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);
         if ($status == 1) {
             // 查询是否有员工使用该角色
-            $employee_data = $EmployeeModel->where('role_id', $id)->first();
+            $employee_where = ['role_id' => $id];
+            if ($is_admin != 1 && $company_id != 0) $employee_where[] = ['company_id', '=', $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];
         $Roles = $RolesModel->where($where)->first();
         if (!$Roles) {
             return json_send(['code' => 'error', 'msg' => '记录不存在']);
@@ -211,10 +236,9 @@ class Roles extends Controller
         if (!$result)    return json_send(['code' => 'error', 'msg' => '设置失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $RolesModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('人员信息管理-角色管理', $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' => '设置成功']);
     }
@@ -231,15 +255,19 @@ class Roles extends Controller
     {
         // 验证参数
         $request->scene('delete')->validate();
+        $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_data = $EmployeeModel->where('role_id', $id)->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];
         // 执行删除
         $Roles = $RolesModel->where($where)->first();
         if (!$Roles) {
@@ -253,7 +281,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('人员信息管理-角色管理', $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/Statistics/OverviewPanel.php

@@ -35,6 +35,8 @@ class OverviewPanel extends Controller
     public function getViolationLinkCount(request $request, ViolationProductModel $violationProductModel)
     {
         $request->scene('getViolationLinkCount')->validate();
+        $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));
         $yesterdayStart = Carbon::yesterday()->startOfDay()->getTimestamp(); // 昨天开始时间 00:00:00
         $yesterdayEnd = Carbon::yesterday()->endOfDay()->getTimestamp(); // 昨天结束时间 23:59:59
@@ -65,6 +67,8 @@ class OverviewPanel extends Controller
      */
     public function Violation_export(request $request, ViolationProductModel $violationProductModel)
     {
+        $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
         $yesterdayEnd = Carbon::yesterday()->endOfDay()->getTimestamp(); // 昨天结束时间 23:59:59
         $start_time_string = request('start_time','');
@@ -150,6 +154,8 @@ class OverviewPanel extends Controller
     public function get_violation_company_count(request $request, ViolationProductModel $violationProductModel)
     {
         $request->scene('get_violation_company_count')->validate();
+        $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));
         $yesterdayStart = Carbon::now()->startOfMonth()->getTimestamp(); // 本月第一天 00:00:00
         $yesterdayEnd = Carbon::yesterday()->endOfDay()->getTimestamp(); // 昨天结束时间 23:59:59
@@ -180,6 +186,8 @@ class OverviewPanel extends Controller
      */
     public function violation_company_export(request $request, ViolationProductModel $violationProductModel)
     {
+        $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
         $yesterdayEnd = Carbon::yesterday()->endOfDay()->getTimestamp(); // 昨天结束时间 23:59:59
         $start_time_string = request('start_time','');
@@ -266,6 +274,8 @@ class OverviewPanel extends Controller
     public function getLowPriceLinkCount(request $request, LowPriceGoodsModel $LowPriceGoodsModel)
     {
         $request->scene('getLowPriceLinkCount')->validate();
+        $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));
         $yesterdayStart = Carbon::yesterday()->startOfDay()->getTimestamp(); // 昨天开始时间 00:00:00
         $yesterdayEnd = Carbon::yesterday()->endOfDay()->getTimestamp(); // 昨天结束时间 23:59:59
@@ -296,6 +306,8 @@ class OverviewPanel extends Controller
      */
     public function low_price_export(request $request, LowPriceGoodsModel $LowPriceGoodsModel)
     {
+        $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
         $yesterdayEnd = Carbon::yesterday()->endOfDay()->getTimestamp(); // 昨天结束时间 23:59:59
         $start_time_string = request('start_time','');
@@ -381,6 +393,8 @@ class OverviewPanel extends Controller
     public function getLowPriceCompanyCount(request $request, LowPriceGoodsModel $LowPriceGoodsModel)
     {
         $request->scene('getLowPriceCompanyCount')->validate();
+        $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));
         $yesterdayStart = Carbon::now()->startOfMonth()->getTimestamp(); // 本月第一天 00:00:00
         $yesterdayEnd = Carbon::yesterday()->endOfDay()->getTimestamp(); // 昨天结束时间 23:59:59
@@ -411,6 +425,8 @@ class OverviewPanel extends Controller
      */
     public function low_price_company_export(request $request, LowPriceGoodsModel $LowPriceGoodsModel)
     {
+        $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
         $yesterdayEnd = Carbon::yesterday()->endOfDay()->getTimestamp(); // 昨天结束时间 23:59:59
         $start_time_string = request('start_time','');
@@ -495,6 +511,8 @@ 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();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 查询条件
         $map  = [];
         $status    = request('status', '');
@@ -657,6 +675,8 @@ 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();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 查询条件
         $map  = [];
         $status    = request('status', '');
@@ -879,6 +899,8 @@ 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();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 查询条件
         $map  = [];
         $status    = request('status', '');
@@ -1041,6 +1063,8 @@ 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();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 查询条件
         $map  = [];
         $status    = request('status', '');

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

@@ -25,6 +25,8 @@ class CompanyCategory extends Controller
     public function list(Request $request, CompanyCategoryModel $CompanyCategoryModel)
     {
         $request->scene('list')->validate();
+        $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));
@@ -59,6 +61,8 @@ class CompanyCategory extends Controller
     public function all(CompanyCategoryModel $CompanyCategoryModel)
     {
         $map  = [];
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         $status    = request('status', '0');
         $start_time = request('start_time', '');
         $end_time = request('end_time', '');
@@ -89,6 +93,8 @@ class CompanyCategory extends Controller
     public function detail(Request $request, CompanyCategoryModel $CompanyCategoryModel)
     {
         $request->scene('detail')->validate();
+        $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];
@@ -108,6 +114,8 @@ class CompanyCategory extends Controller
     public function add(Request $request, CompanyCategoryModel $CompanyCategoryModel)
     {
         $request->scene('add')->validate();
+        $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', '');
@@ -122,10 +130,9 @@ class CompanyCategory extends Controller
         if (!$result)     return json_send(['code' => 'error', 'msg' => '新增失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $CompanyCategoryModel->getTable();
         $notes_type = 1; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-公司分类管理', $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' => '新增成功']);
     }
@@ -140,6 +147,8 @@ class CompanyCategory extends Controller
     public function edit(Request $request, CompanyCategoryModel $CompanyCategoryModel)
     {
         $request->scene('edit')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收参数
         $id         = request('id', 0);
         // 接收数据
@@ -160,10 +169,9 @@ class CompanyCategory extends Controller
         if (!$result)     return json_send(['code' => 'error', 'msg' => '修改失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $CompanyCategoryModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-公司分类管理', $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' => '修改成功']);
     }
@@ -179,6 +187,8 @@ class CompanyCategory extends Controller
     {
         // 验证参数
         $request->scene('set_status')->validate();
+        $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);
@@ -199,10 +209,9 @@ class CompanyCategory extends Controller
         if (!$result)    return json_send(['code' => 'error', 'msg' => '设置失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $CompanyCategoryModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-公司分类管理', $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' => '设置成功']);
     }
@@ -219,6 +228,8 @@ class CompanyCategory extends Controller
     {
         // 验证参数
         $request->scene('delete')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收数据
         $id = request('id', 0);
         $violation_store_count = $ViolationStoreModel->where(['category_id' => $id])->count();
@@ -235,10 +246,9 @@ class CompanyCategory extends Controller
         if (!$result)    return json_send(['code' => 'error', 'msg' => '删除失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $CompanyCategoryModel->getTable();
         $notes_type = 3; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-公司分类管理', $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

@@ -27,6 +27,8 @@ class ControlGoods extends Controller
     public function list(Request $request, ControlGoodsModel $ControlGoodsModel, ViolationStoreModel $ViolationStoreModel, ControlGoodsCompanyModel $ControlGoodsCompanyModel, ProductCategoryModel $ProductCategoryModel)
     {
         $request->scene('list')->validate();
+        $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));
@@ -90,6 +92,8 @@ class ControlGoods extends Controller
     public function detail(Request $request, ControlGoodsModel $ControlGoodsModel,ControlGoodsCompanyModel $ControlGoodsCompanyModel, ProductCategoryModel $ProductCategoryModel)
     {
         $request->scene('detail')->validate();
+        $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];
@@ -128,6 +132,8 @@ class ControlGoods extends Controller
     public function add(Request $request, ControlGoodsModel $ControlGoodsModel)
     {
         $request->scene('add')->validate();
+        $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', '');
@@ -160,6 +166,8 @@ class ControlGoods extends Controller
     public function edit(Request $request, ControlGoodsModel $ControlGoodsModel)
     {
         $request->scene('edit')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         // 接收参数
         $id         = request('id', 0);
         // 接收数据
@@ -196,6 +204,8 @@ class ControlGoods extends Controller
     {
         // 验证参数
         $request->scene('set_status')->validate();
+        $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);
@@ -221,6 +231,8 @@ class ControlGoods extends Controller
     {
         // 验证参数
         $request->scene('delete')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收数据
         $id = request('id', 0);
         // 查询用户

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

@@ -30,6 +30,8 @@ class LowPriceGoods extends Controller
     public function list(Request $request, LowPriceGoodsModel $LowPriceGoodsModel, ViolationStoreModel $ViolationStoreModel, LowPriceGoodsCompanyModel $LowPriceGoodsCompanyModel, ProductCategoryModel $ProductCategoryModel)
     {
         $request->scene('list')->validate();
+        $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));
@@ -93,6 +95,8 @@ class LowPriceGoods extends Controller
     public function detail(Request $request, LowPriceGoodsModel $LowPriceGoodsModel, LowPriceGoodsCompanyModel $LowPriceGoodsCompanyModel, ProductCategoryModel $ProductCategoryModel)
     {
         $request->scene('detail')->validate();
+        $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];
@@ -131,6 +135,8 @@ class LowPriceGoods extends Controller
     public function add(Request $request, LowPriceGoodsModel $LowPriceGoodsModel,ViolationProductModel $ViolationProductModel)
     {
         $request->scene('add')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         //获取禁止商品启动数量
         $violation_product_count = $ViolationProductModel->where('status', 0)->count();
         //获取低价挂网商品启用数量
@@ -164,7 +170,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('清洗配置-低价商品管理', $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' => '新增成功']);
     }
@@ -179,6 +185,8 @@ class LowPriceGoods extends Controller
     public function edit(Request $request, LowPriceGoodsModel $LowPriceGoodsModel)
     {
         $request->scene('edit')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收参数
         $id         = request('id', 0);
         // 接收数据
@@ -205,10 +213,9 @@ class LowPriceGoods extends Controller
         if (!$result)     return json_send(['code' => 'error', 'msg' => '修改失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $LowPriceGoodsModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-低价商品管理', $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' => '修改成功']);
     }
@@ -224,6 +231,8 @@ class LowPriceGoods extends Controller
     {
         // 验证参数
         $request->scene('set_status')->validate();
+        $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);
@@ -249,10 +258,9 @@ class LowPriceGoods extends Controller
         if (!$result)    return json_send(['code' => 'error', 'msg' => '设置失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $LowPriceGoodsModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-低价商品管理', $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' => '设置成功']);
     }
@@ -269,6 +277,8 @@ class LowPriceGoods extends Controller
     {
         // 验证参数
         $request->scene('delete')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收数据
         $id = request('id', 0);
         // 查询用户
@@ -291,7 +301,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('清洗配置-低价商品管理', $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,8 @@ class PlatForm extends Controller
     public function list(Request $request, PlatFormModel $PlatFormModel, EmployeeModel $EmployeeModel)
     {
         $request->scene('list')->validate();
+        $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));
@@ -66,6 +68,8 @@ class PlatForm extends Controller
     public function all(PlatFormModel $PlatFormModel)
     {
         $map  = [];
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         $status    = request('status', '0');
         $start_time = request('start_time', '');
         $end_time = request('end_time', '');
@@ -96,6 +100,8 @@ class PlatForm extends Controller
     public function detail(Request $request, PlatFormModel $PlatFormModel, EmployeeModel $EmployeeModel)
     {
         $request->scene('detail')->validate();
+        $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];
@@ -118,6 +124,8 @@ class PlatForm extends Controller
     public function add(Request $request, PlatFormModel $PlatFormModel)
     {
         $request->scene('add')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收数据
         $all_data = request()->all();
         $employee_ids = request('employee_ids', '');
@@ -132,10 +140,9 @@ class PlatForm extends Controller
         if (!$result)     return json_send(['code' => 'error', 'msg' => '新增失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $PlatFormModel->getTable();
         $notes_type = 1; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-平台管理管理', $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' => '新增成功']);
     }
@@ -150,6 +157,8 @@ class PlatForm extends Controller
     public function edit(Request $request, PlatFormModel $PlatFormModel)
     {
         $request->scene('edit')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收参数
         $id         = request('id', 0);
         // 接收数据
@@ -170,10 +179,9 @@ class PlatForm extends Controller
         if (!$result)     return json_send(['code' => 'error', 'msg' => '修改失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $PlatFormModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-平台管理管理', $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' => '修改成功']);
     }
@@ -189,6 +197,8 @@ class PlatForm extends Controller
     {
         // 验证参数
         $request->scene('set_status')->validate();
+        $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);
@@ -202,10 +212,9 @@ class PlatForm extends Controller
         if (!$result)    return json_send(['code' => 'error', 'msg' => '设置失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $PlatFormModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-平台管理管理', $admin_id, $is_admin, $table_name, $notes_type, [], ['status' => $status], '修改了平台' . $PlatForm->name . '状态');
+        $this->addAdminHistory('清洗配置-平台管理管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, [], ['status' => $status], '修改了平台' . $PlatForm->name . '状态');
         // 告知结果
         return             json_send(['code' => 'success', 'msg' => '设置成功']);
     }
@@ -222,6 +231,8 @@ class PlatForm extends Controller
     {
         // 验证参数
         $request->scene('delete')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收数据
         $id = request('id', 0);
         // 查询用户
@@ -234,10 +245,9 @@ class PlatForm extends Controller
         if (!$result)    return json_send(['code' => 'error', 'msg' => '删除失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $PlatFormModel->getTable();
         $notes_type = 3; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-平台管理管理', $admin_id, $is_admin, $table_name, $notes_type, $PlatForm->toArray(), [], '删除了平台' . $PlatForm->name . '信息');
+        $this->addAdminHistory('清洗配置-平台管理管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, $PlatForm->toArray(), [], '删除了平台' . $PlatForm->name . '信息');
         // 告知结果
         return             json_send(['code' => 'success', 'msg' => '删除成功']);
     }

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

@@ -26,6 +26,8 @@ class ProductCategory extends Controller
     public function list(Request $request, ProductCategoryModel $ProductCategoryModel)
     {
         $request->scene('list')->validate();
+        $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));
@@ -60,6 +62,8 @@ class ProductCategory extends Controller
     public function all(ProductCategoryModel $ProductCategoryModel)
     {
         $map  = [];
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         $status    = request('status', '0');
         $start_time = request('start_time', '');
         $end_time = request('end_time', '');
@@ -89,6 +93,8 @@ class ProductCategory extends Controller
     public function detail(Request $request, ProductCategoryModel $ProductCategoryModel)
     {
         $request->scene('detail')->validate();
+        $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];
@@ -108,6 +114,8 @@ class ProductCategory extends Controller
     public function add(Request $request, ProductCategoryModel $ProductCategoryModel)
     {
         $request->scene('add')->validate();
+        $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', '');
@@ -122,10 +130,9 @@ class ProductCategory extends Controller
         if (!$result)     return json_send(['code' => 'error', 'msg' => '新增失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $ProductCategoryModel->getTable();
         $notes_type = 1; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-商品分类管理', $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' => '新增成功']);
     }
@@ -140,6 +147,8 @@ class ProductCategory extends Controller
     public function edit(Request $request, ProductCategoryModel $ProductCategoryModel)
     {
         $request->scene('edit')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收参数
         $id         = request('id', 0);
         // 接收数据
@@ -160,10 +169,9 @@ class ProductCategory extends Controller
         if (!$result)     return json_send(['code' => 'error', 'msg' => '修改失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $ProductCategoryModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-商品分类管理', $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' => '修改成功']);
     }
@@ -179,6 +187,8 @@ class ProductCategory extends Controller
     {
         // 验证参数
         $request->scene('set_status')->validate();
+        $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);
@@ -203,10 +213,9 @@ class ProductCategory extends Controller
         if (!$result)    return json_send(['code' => 'error', 'msg' => '设置失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $ProductCategoryModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-商品分类管理', $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' => '设置成功']);
     }
@@ -223,6 +232,8 @@ class ProductCategory extends Controller
     {
         // 验证参数
         $request->scene('delete')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收数据
         $id = request('id', 0);
         $low_price_goods_count = $LowPriceGoodsModel->where(['category_id' => $id])->count();
@@ -245,10 +256,9 @@ class ProductCategory extends Controller
         if (!$result)    return json_send(['code' => 'error', 'msg' => '删除失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $ProductCategoryModel->getTable();
         $notes_type = 3; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-商品分类管理', $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,6 +30,8 @@ class ViolationProduct extends Controller
     public function list(Request $request, ViolationProductModel $ViolationProductModel, ViolationStoreModel $ViolationStoreModel, ViolationProductCompanyModel $ViolationProductCompanyModel, ProductCategoryModel $ProductCategoryModel)
     {
         $request->scene('list')->validate();
+        $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));
@@ -93,6 +95,8 @@ class ViolationProduct extends Controller
     public function detail(Request $request, ViolationProductModel $ViolationProductModel, ViolationProductCompanyModel $ViolationProductCompanyModel, ProductCategoryModel $ProductCategoryModel)
     {
         $request->scene('detail')->validate();
+        $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];
@@ -131,6 +135,8 @@ class ViolationProduct extends Controller
     public function add(Request $request, ViolationProductModel $ViolationProductModel,LowPriceGoodsModel $LowPriceGoodsModel)
     {
         $request->scene('add')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         //获取禁止商品启动数量
         $violation_product_count = $ViolationProductModel->where('status', 0)->count();
         //获取低价挂网商品启用数量
@@ -161,10 +167,9 @@ class ViolationProduct extends Controller
         if (!$result)     return json_send(['code' => 'error', 'msg' => '新增失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $ViolationProductModel->getTable();
         $notes_type = 1; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-禁止商品管理', $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' => '新增成功']);
     }
@@ -179,6 +184,8 @@ class ViolationProduct extends Controller
     public function edit(Request $request, ViolationProductModel $ViolationProductModel)
     {
         $request->scene('edit')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收参数
         $id         = request('id', 0);
         // 接收数据
@@ -205,10 +212,9 @@ class ViolationProduct extends Controller
         if (!$result)     return json_send(['code' => 'error', 'msg' => '修改失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $ViolationProductModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-禁止商品管理', $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' => '修改成功']);
     }
@@ -224,6 +230,8 @@ class ViolationProduct extends Controller
     {
         // 验证参数
         $request->scene('set_status')->validate();
+        $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);
@@ -249,10 +257,9 @@ class ViolationProduct extends Controller
         if (!$result)    return json_send(['code' => 'error', 'msg' => '设置失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $ViolationProductModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-禁止商品管理', $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' => '设置成功']);
     }
@@ -269,6 +276,8 @@ class ViolationProduct extends Controller
     {
         // 验证参数
         $request->scene('delete')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收数据
         $id = request('id', 0);
         // 查询用户
@@ -289,10 +298,9 @@ class ViolationProduct extends Controller
             $ViolationProductModel->where($where)->delete();
             // 记录行为
             $admin_id   = request('access_token.uid', 0); //用户ID
-            $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
             $table_name = $ViolationProductModel->getTable();
             $notes_type = 3; //操作类型，1添加，2修改，3=删除
-            $this->addAdminHistory('清洗配置-禁止商品管理', $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' => '删除成功']);

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

@@ -29,6 +29,8 @@ class ViolationStore extends Controller
     public function list(Request $request, ViolationStoreModel $ViolationStoreModel, EmployeeModel $EmployeeModel, CompanyCategoryModel $CompanyCategoryModel, CitysModel $CitysModel)
     {
         $request->scene('list')->validate();
+        $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));
@@ -84,6 +86,8 @@ class ViolationStore extends Controller
     public function all(Request $request, ViolationStoreModel $ViolationStoreModel)
     {
         $request->scene('all')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 查询条件
         $map  = [];
         $status    = request('status', '0');
@@ -122,6 +126,8 @@ class ViolationStore extends Controller
     public function detail(Request $request, ViolationStoreModel $ViolationStoreModel, EmployeeModel $EmployeeModel, CompanyCategoryModel $CompanyCategoryModel, CitysModel $CitysModel)
     {
         $request->scene('detail')->validate();
+        $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];
@@ -150,6 +156,8 @@ class ViolationStore extends Controller
     public function add(Request $request, ViolationStoreModel $ViolationStoreModel)
     {
         $request->scene('add')->validate();
+        $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', '');
@@ -174,10 +182,9 @@ class ViolationStore extends Controller
         if (!$result)     return json_send(['code' => 'error', 'msg' => '新增失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $ViolationStoreModel->getTable();
         $notes_type = 1; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-公司管理', $admin_id, $is_admin, $table_name, $notes_type, [], $all_data, '新增了公司' . $all_data['company_name'] . '信息');
+        $this->addAdminHistory('清洗配置-公司管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, [], $all_data, '新增了公司' . $all_data['company_name'] . '信息');
         // 告知结果
         return json_send(['code' => 'success', 'msg' => '新增成功']);
     }
@@ -192,6 +199,8 @@ class ViolationStore extends Controller
     public function edit(Request $request, ViolationStoreModel $ViolationStoreModel)
     {
         $request->scene('edit')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');//是否管理员操作 0=是1=否
         // 接收参数
         $id         = request('id', 0);
         // 接收数据
@@ -222,10 +231,9 @@ class ViolationStore extends Controller
         if (!$result)     return json_send(['code' => 'error', 'msg' => '修改失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $ViolationStoreModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-公司管理', $admin_id, $is_admin, $table_name, $notes_type, $oldData, $all_data, '修改了公司' . $oldData['company_name'] . '信息');
+        $this->addAdminHistory('清洗配置-公司管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, $oldData, $all_data, '修改了公司' . $oldData['company_name'] . '信息');
         // 告知结果
         return json_send(['code' => 'success', 'msg' => '修改成功']);
     }
@@ -241,6 +249,8 @@ class ViolationStore extends Controller
     {
         // 验证参数
         $request->scene('set_status')->validate();
+        $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);
@@ -254,10 +264,9 @@ class ViolationStore extends Controller
         if (!$result)    return json_send(['code' => 'error', 'msg' => '设置失败']);
         // 记录行为
         $admin_id   = request('access_token.uid', 0); //用户ID
-        $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $ViolationStoreModel->getTable();
         $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-公司管理', $admin_id, $is_admin, $table_name, $notes_type, [], ['status' => $status], '修改了公司' . $ViolationStore->company_name . '状态');
+        $this->addAdminHistory('清洗配置-公司管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, [], ['status' => $status], '修改了公司' . $ViolationStore->company_name . '状态');
         // 告知结果
         return             json_send(['code' => 'success', 'msg' => '设置成功']);
     }
@@ -274,6 +283,8 @@ class ViolationStore extends Controller
     {
         // 验证参数
         $request->scene('delete')->validate();
+        $company_id = request('access_token.company_id', '0');
+        $is_admin = request('access_token.is_admin', '0');
         // 接收数据
         $id = request('id', 0);
         //查询是否已经被使用
@@ -298,7 +309,7 @@ class ViolationStore extends Controller
         $is_admin   = request('access_token.is_admin'); //是否管理员操作 0=是1=否
         $table_name = $ViolationStoreModel->getTable();
         $notes_type = 3; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('清洗配置-公司管理', $admin_id, $is_admin, $table_name, $notes_type, $ViolationStore->toarray(), [], '删除了公司' . $ViolationStore->company_name . '信息');
+        $this->addAdminHistory('清洗配置-公司管理',$company_id, $admin_id, $is_admin, $table_name, $notes_type, $ViolationStore->toarray(), [], '删除了公司' . $ViolationStore->company_name . '信息');
         // 告知结果
         return             json_send(['code' => 'success', 'msg' => '删除成功']);
     }

app/Models/Manager/AdminHistory.php

@@ -31,9 +31,10 @@ class AdminHistory extends Model
      * @param   String       $general_description    操作描述
      * 
      */
-    public function addAll($admin_menu_name, $uid, $is_admin, $table, $type, $oldData, $newData, $general_description = '')
+    public function addAll($admin_menu_name,$company_id='0', $uid, $is_admin, $table, $type, $oldData, $newData, $general_description = '')
     {
         $insert_data =  [
+            'company_id'       => $company_id,
             // 模块菜单名称
             'module_menu_name'   => $admin_menu_name,
             //操作描述

app/Models/Manager/Collect/Product.php

@@ -67,6 +67,7 @@ class Product extends Model
                 'sampling_cycle' => $data['sampling_cycle'],
                 'sampling_start_time' => $data['sampling_start_time'],
                 'sampling_end_time' => $data['sampling_end_time'],
+                'company_id' => $data['company_id'],
                 'insert_time' => time(),
             ];
             $Product_id = $this->insertGetId($insert_data);

app/Models/Manager/Personnel/Department.php

@@ -34,6 +34,7 @@ class Department extends Model
     {
         $insert_data = [
             'name' => $data['name'],
+            'company_id'=> $data['company_id'],
             'insert_time' => time(),
         ];
         $Department_id = $this->insertGetId($insert_data);

app/Models/Manager/Personnel/Employee.php

@@ -107,6 +107,7 @@ class Employee extends Model
                 'department_ids' => isset($data['department_ids']) ? ',' . $data['department_ids'] . ',' : '',
                 'open_notice' => $data['open_notice'],
                 'duty_type' => isset($data['duty_type']) ? $data['duty_type'] : '',
+                'company_id' => $data['company_id'],
                 'insert_time' => time(),
             ];
             $Employee_id = $this->insertGetId($insert_data);
@@ -131,6 +132,7 @@ class Employee extends Model
                     $insert_department_data[] = [
                         'employee_id' => $Employee_id,
                         'department_id' => $department_id,
+                        'company_id' => $data['company_id'],
                     ];
                 }
                 $EmployeeDepartmentModel->insert($insert_department_data);
@@ -169,6 +171,7 @@ class Employee extends Model
         $Employee->department_ids = isset($data['department_ids']) ? ',' . $data['department_ids'] . ',' : '';
         $Employee->open_notice = $data['open_notice'];
         $Employee->duty_type = isset($data['duty_type']) ? $data['duty_type'] : '';
+        $Employee->company_id = $data['company_id'];
         $Employee->update_time = time();
         $Employee->save();
         return true;
@@ -199,6 +202,7 @@ class Employee extends Model
             $Employee->department_ids = isset($data['department_ids']) ? ',' . $data['department_ids'] . ',' : '';
             $Employee->open_notice = $data['open_notice'];
             $Employee->duty_type = isset($data['duty_type']) ? $data['duty_type'] : '';
+            $Employee->company_id = $data['company_id'];
             $Employee->update_time = time();
             $Employee->save();
 
@@ -222,6 +226,7 @@ class Employee extends Model
                     $insert_department_data[] = [
                         'employee_id' => $Employee->id,
                         'department_id' => $department_id,
+                        'company_id' => $data['company_id'],
                     ];
                 }
                 $EmployeeDepartmentModel->insert($insert_department_data);
@@ -345,10 +350,10 @@ class Employee extends Model
      * @param   int      用户ID
      * 
      */
-    public function Login($uid, $module = 'manager')
+    public function Login($uid,$company_id=0, $module = 'manager')
     {
         // 组合数据
-        $jwtData                            = ['uid' => $uid, 'is_admin' => '0', 'type' => $module, 'expire' => time() + 3600 * 8];
+        $jwtData                            = ['company_id'=>$company_id, 'uid' => $uid, 'is_admin' => '0', 'type' => $module, 'expire' => time() + 3600 * 8];
         // 登录成功
         $token                              = AccessToken::encode($jwtData);
         // 如果异常的话

app/Models/Manager/Personnel/Roles.php

@@ -35,6 +35,7 @@ class Roles extends Model
     {
         $insert_data = [
             'name' => $data['name'],
+            'company_id' => $data['company_id'],
             'insert_time' => time(),
         ];
         $Roles_id = $this->insertGetId($insert_data);