panxiang/swiftadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!25 update app/AdminController.php.

Browse Source 
Merge pull request !25 from liveup/N/A
This commit is contained in:
meystack
2022-08-22 12:24:49 +00:00
committed by Gitee
parent 53bf00fde0 d0c46daa3c
commit cc76fbb2a2
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/AdminController.php
View File

@@ -69,7 +69,8 @@ class AdminController extends BaseController
* 管理员信息
* @var array
*/
public $admin = [];
//public $admin = [];使用以下替代
//request()->adminInfo['id']
/**
* 获取模板
@@ -181,7 +182,7 @@ class AdminController extends BaseController
$post = $this->preRuleOutFields(\request()->post());
if ($this->dataLimit) {
$post[$this->dataLimitField] = $this->admin['id'];
$post[$this->dataLimitField] = request()->adminInfo['id'];
}
$validate = $this->isValidate ? get_class($this->model) : $this->isValidate;
@@ -209,7 +210,7 @@ class AdminController extends BaseController
// 限制数据调用
if (!$this->auth->SuperAdmin() && $this->dataLimit
&& in_array($this->dataLimitField, $this->model->getFields())) {
if ($data[$this->dataLimitField] != $this->admin['id']) {
if ($data[$this->dataLimitField] != request()->adminInfo['id']) {
return $this->error('没有权限');
}
}
@@ -250,7 +251,7 @@ class AdminController extends BaseController
foreach ($list as $item) {
if (!$this->auth->SuperAdmin() && $this->dataLimit
&& in_array($this->dataLimitField, $this->model->getFields())) {
if ($item[$this->dataLimitField] != $this->admin['id']) {
if ($item[$this->dataLimitField] != request()->adminInfo['id']) {
continue;
}
}
@@ -280,7 +281,7 @@ class AdminController extends BaseController
$where[] = ['id', '=', input('id')];
if (!$this->auth->SuperAdmin() && $this->dataLimit
&& in_array($this->dataLimitField, $this->model->getFields())) {
$where[] = [$this->dataLimitField, '=', $this->admin['id']];
$where[] = [$this->dataLimitField, '=',request()->adminInfo['id']];
}
try {
@@ -507,7 +508,7 @@ class AdminController extends BaseController
// 限制数据字段
if (!$this->auth->SuperAdmin() && $this->dataLimit) {
if (in_array($this->dataLimitField, $this->tableFields)) {
$where[] = [$this->dataLimitField, '=', $this->admin['id']];
$where[] = [$this->dataLimitField, '=', request()->adminInfo['id']];
}
}