fnvtk/cunkebao_v3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整代码格式及使用常量去替换常用值

Browse Source
This commit is contained in:
柳清爽
2025-05-08 10:39:53 +08:00
parent b5939b36b3
commit 0426485177
31 changed files with 230 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Server/application/superadmin/controller/Menu/GetMenuTreeController.php
View File

@@ -2,6 +2,7 @@
namespace app\superadmin\controller\Menu;
use app\common\model\Administrator as AdministratorModel;
use app\common\model\Menu as MenuModel;
use app\common\model\AdministratorPermissions as AdministratorPermissionsModel;
use app\superadmin\controller\BaseController;
@@ -69,7 +70,7 @@ class GetMenuTreeController extends BaseController
protected function getMenuTree(): array
{
// 获取所有菜单
$allMenus = MenuModel::where('status', 1)->order('sort', 'asc')->select()->toArray();
$allMenus = MenuModel::where('status', MenuModel::STATUS_ACTIVE)->order('sort', 'asc')->select()->toArray();
// 组织成树状结构
return $allMenus ? $this->buildMenuTree($allMenus) : [];
@@ -84,8 +85,8 @@ class GetMenuTreeController extends BaseController
protected function getTopMenusInPermissionIds(array $permissionIds): array
{
$where = [
'parentId' => 0,
'status' => 1,
'parentId' => MenuModel::TOP_LEVEL,
'status' => MenuModel::STATUS_ACTIVE,
];
return MenuModel::where($where)->whereIn('id', $permissionIds)->order('sort', 'asc')->select()->toArray();
@@ -99,7 +100,7 @@ class GetMenuTreeController extends BaseController
*/
protected function getAllChildrenInPermissionIds(array $topMenuIds): array
{
return MenuModel::where('status', 1)->whereIn('parentId', $topMenuIds)->order('sort', 'asc')->select()->toArray();
return MenuModel::where('status', MenuModel::STATUS_ACTIVE)->whereIn('parentId', $topMenuIds)->order('sort', 'asc')->select()->toArray();
}
/**
@@ -165,7 +166,7 @@ class GetMenuTreeController extends BaseController
*/
public function index()
{
if ($this->getAdminInfo('id') == 1) {
if ($this->getAdminInfo('id') == AdministratorModel::MASTER_ID) {
$menuTree = $this->getMenuTree();
} else {
$menuTree = $this->getMenuTreeByPermissions(

4
Server/application/superadmin/controller/Menu/GetTopLevelForPermissionController.php
View File

@@ -19,8 +19,8 @@ class GetTopLevelForPermissionController extends BaseController
protected function getTopLevelMenus(): array
{
$where = [
'parentId' => 0,
'status' => 1
'parentId' => MenuModel::TOP_LEVEL,
'status' => MenuModel::STATUS_NORMAL
];
return MenuModel::where($where)->field('id, title')->order('sort', 'asc')->select()->toArray();