|
|
@ -1579,8 +1579,6 @@ class Aauth |
|
|
|
{ |
|
|
|
{ |
|
|
|
$groupModel = new GroupModel(); |
|
|
|
$groupModel = new GroupModel(); |
|
|
|
|
|
|
|
|
|
|
|
$groupModel->select('id, name, definition'); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (! is_null($orderBy)) |
|
|
|
if (! is_null($orderBy)) |
|
|
|
{ |
|
|
|
{ |
|
|
|
$groupModel->orderBy($orderBy); |
|
|
|
$groupModel->orderBy($orderBy); |
|
|
@ -2136,8 +2134,6 @@ class Aauth |
|
|
|
{ |
|
|
|
{ |
|
|
|
$permModel = new PermModel(); |
|
|
|
$permModel = new PermModel(); |
|
|
|
|
|
|
|
|
|
|
|
$permModel->select('id, name, definition'); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (! is_null($orderBy)) |
|
|
|
if (! is_null($orderBy)) |
|
|
|
{ |
|
|
|
{ |
|
|
|
$permModel->orderBy($orderBy); |
|
|
|
$permModel->orderBy($orderBy); |
|
|
|