[智价云] 数据查询更新

app/Http/Controllers/Api/Process/Notice.php

@@ -25,19 +25,13 @@ class Notice extends Api
         $user_info = $this->checkLogin();
         if (!$user_info) return json_send(['code' => 'error', 'msg' => '请先登录']);
         $user_id = $user_info['uid'];
+        $company_id = $user_info['company_id'];
         // 验证规则
         $Request->scene('list')->validate();
-        $admin_company_id = request('admin_company_id', '0');
-        $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         $map = [];
         // 权限判断
-        if ($is_admin != 1 && $company_id != 0) {
-            $map['company_id'] = $company_id;
-            $map['custom_uid'] = $user_id;
-        } else {
-            $map['company_id'] = $admin_company_id;
-        }
+        $map['company_id'] = $company_id;
+        $map['custom_uid'] = $user_id;
         // 接收参数
         $status                        = request('status');
         $limit                        = request('limit', config('page_num', 10));
@@ -66,19 +60,13 @@ class Notice extends Api
         $user_info = $this->checkLogin();
         if (!$user_info) return json_send(['code' => 'error', 'msg' => '请先登录']);
         $user_id = $user_info['uid'];
+        $company_id = $user_info['company_id'];
         // 验证参数
         $request->scene('set_status')->validate();
-        $admin_company_id = request('admin_company_id', '0');
-        $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         $map = [];
         // 权限判断
-        if ($is_admin != 1 && $company_id != 0) {
-            $map['company_id'] = $company_id;
-            $map['custom_uid'] = $user_id;
-        } else {
-            $map['company_id'] = $admin_company_id;
-        }
+        $map['company_id'] = $company_id;
+        $map['custom_uid'] = $user_id;
         // 设置状态
         $id                                = request('id', 0);
         $status                            = request('status', 0);
@@ -91,11 +79,6 @@ class Notice extends Api
         $result                            = $NoticesModel->where($map)->update(['status' => $status, 'update_time' => time()]);
         // 提示新增失败
         if (!$result)                    return json_send(['code' => 'error', 'msg' => '设置失败']);
-        // 记录行为
-        $admin_id   = request('access_token.uid', 0); //用户ID
-        $table_name = $NoticesModel->getTable();
-        $notes_type = 2; //操作类型，1添加，2修改，3=删除
-        $this->addAdminHistory('系统通知', 0, $admin_id, $is_admin, $table_name, $notes_type, [], ['status' => $status], "修改了记录ID为:$id 的通知状态");
         // 告知结果
         return                          json_send(['code' => 'success', 'msg' => '设置成功', 'data' => '']);
     }
@@ -111,19 +94,13 @@ class Notice extends Api
         $user_info = $this->checkLogin();
         if (!$user_info) return json_send(['code' => 'error', 'msg' => '请先登录']);
         $user_id = $user_info['uid'];
+        $company_id = $user_info['company_id'];
         // 验证规则
         $Request->scene('message_count')->validate();
-        $admin_company_id = request('admin_company_id', '0');
-        $company_id = request('access_token.company_id', '0');
-        $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
         $map = [];
         // 权限判断
-        if ($is_admin != 1 && $company_id != 0) {
-            $map['company_id'] = $company_id;
-            $map['custom_uid'] = $user_id;
-        } else {
-            $map['company_id'] = $admin_company_id;
-        }
+        $map['company_id'] = $company_id;
+        $map['custom_uid'] = $user_id;
         $map[] = ['status', '=', 0];
         // 查询系统用户
         $unread_count                    = $NoticesModel->where($map)->orderByDesc('id')->count();