diff --git a/crmeb/app/model/system/SystemRouteCate.php b/crmeb/app/model/system/SystemRouteCate.php index 73509e515..354960a74 100644 --- a/crmeb/app/model/system/SystemRouteCate.php +++ b/crmeb/app/model/system/SystemRouteCate.php @@ -39,6 +39,6 @@ class SystemRouteCate extends BaseModel */ public function children() { - return $this->hasMany(SystemRoute::class, 'id', 'cate_id')->field(['id', 'cate_id', 'name', 'path', 'method'])->order('add_time desc'); + return $this->hasMany(SystemRoute::class, 'cate_id', 'id')->field(['id', 'cate_id', 'name', 'path', 'method'])->order('add_time desc'); } } diff --git a/crmeb/app/services/system/SystemRouteCateServices.php b/crmeb/app/services/system/SystemRouteCateServices.php index 1baab1307..df80b661c 100644 --- a/crmeb/app/services/system/SystemRouteCateServices.php +++ b/crmeb/app/services/system/SystemRouteCateServices.php @@ -96,7 +96,7 @@ class SystemRouteCateServices extends BaseServices $cateInfo = $cateInfo ? $cateInfo->toArray() : []; $url .= '/' . $id; } - $options = $this->dao->selectList(['app_name' => $appName])->toArray(); + $options = $this->dao->selectList(['app_name' => $appName], 'name as label,path as value')->toArray(); $rule = [ FormBuilder::select('pid', '上级分类', (int)($cateInfo['pid'] ?? 0))->options($options), FormBuilder::input('name', '分类名称', $cateInfo['name'] ?? '')->required(), diff --git a/crmeb/app/services/system/SystemRouteServices.php b/crmeb/app/services/system/SystemRouteServices.php index 32fbe799f..f11ea60d3 100644 --- a/crmeb/app/services/system/SystemRouteServices.php +++ b/crmeb/app/services/system/SystemRouteServices.php @@ -82,7 +82,7 @@ class SystemRouteServices extends BaseServices public function getTreeList(array $where, string $appName = 'adminapi') { $list = app()->make(SystemRouteCateServices::class) - ->selectList(['app_name' => $appName], '*', 0, 0, 'id asc', [ + ->selectList(['app_name' => $appName], '*', 0, 0, 'id asc,sort desc', [ 'children' => function ($query) use ($where) { $query->where('app_name', $where['app_name']) ->when('' !== $where['name_like'], function ($q) use ($where) {