hi-tpext
/
tpextmyadmin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update

This commit is contained in:
LHY 2020-03-11 14:03:03 +08:00
parent b16489b98a
commit 59fa353a96
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/admin/controller/Admin.php
View File

@ -79,15 +79,7 @@ class Admin extends Controller
$where[] = ['role_id', 'eq', $searchData['role_id']];
}
$sortOrder = 'id asc';
$sort = input('__sort__');
if ($sort) {
$arr = explode(':', $sort);
if (count($arr) == 2) {
$sortOrder = implode(' ', $arr);
}
}
$sortOrder = input('__sort__', 'id desc');
$data = $this->dataModel->where($where)->order($sortOrder)->limit(($page - 1) * $pagezise, $pagezise)->select();
@ -101,6 +93,7 @@ class Admin extends Controller
unset($d);
$table->data($data);
$table->sortOrder($sortOrder);
$table->paginator($this->dataModel->where($where)->count(), $pagezise);
$table->getToolbar()

9
src/admin/model/AdminUser.php
View File

@ -64,19 +64,18 @@ class AdminUser extends Model
if (!$data) {
return false;
}
session('admin_user', $data);
if ($data['role_id'] == 1) {
return true;
}
$url = "/admin/$controller/$action";
if (in_array($url, ['/admin/index/index', '/admin/index/denied', '/admin/index/logout', '/admin/index/login'])) {
return true;
}
if ($data['role_id'] == 1) {
return true;
}
if ($data['enable'] == 0) {
session('admin_user', null);
session('admin_id', null);