|
|
@@ -83,7 +83,7 @@ class MenuService extends BaseService
|
|
|
*/
|
|
|
public static function findAll(array $search = [])
|
|
|
{
|
|
|
- return self::model()::where(self::getWhere($search))->get();
|
|
|
+ return self::model()::where(self::getWhere($search))->orderBy('sort')->get();
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -163,7 +163,7 @@ class MenuService extends BaseService
|
|
|
|
|
|
$roles = RoleService::model()::with(['menus'=> function ($query) use ($type) {
|
|
|
$query->where('type', $type);
|
|
|
- }])->whereIn('id',$roleIds)->get();
|
|
|
+ }])->whereIn('id',$roleIds)->orderBy('sort')->get();
|
|
|
$allMenus = [];
|
|
|
|
|
|
foreach ($roles as $role) {
|