Skip to content

Commit 85fb7ee

Browse files
committed
[fix] 修复mysql下排序语法错误
1 parent 97183f3 commit 85fb7ee

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

Ape.Volo.Business/Permission/PermissionService.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ public async Task<List<string>> GetPermissionRolesAsync(long userId)
2929
var permissionRoles = await SugarClient
3030
.Queryable<UserRole, RoleMenu, Menu>((ur, rm, m) => ur.RoleId == rm.RoleId && rm.MenuId == m.Id)
3131
.GroupBy((ur, rm, m) => m.Permission)
32-
.Where((ur, rm, m) => ur.UserId == userId && m.Type != MenuType.Catalog)
33-
.OrderBy((ur, rm, m) => m.Sort)
32+
.Where((ur, rm, m) => ur.UserId == userId && m.Type != MenuType.Catalog && m.Permission != null)
33+
.OrderBy((ur, rm, m) => m.Permission)
3434
.ClearFilter<ICreateByEntity>()
3535
.Select((ur, rm, m) => m.Permission).ToListAsync();
3636
permissionRoles = permissionRoles.Where(x => !x.IsNullOrEmpty()).ToList();
@@ -50,6 +50,7 @@ public async Task<List<PermissionVo>> GetPermissionVoAsync(long userId)
5050
.Queryable<UserRole, RoleApis, Apis>((ur, ra, a) => ur.RoleId == ra.RoleId && ra.ApisId == a.Id)
5151
.GroupBy((ur, ra, a) => new { a.Url, a.Method })
5252
.Where(ur => ur.UserId == userId)
53+
.OrderBy((ur, ra, a) => a.Url)
5354
.ClearFilter<ICreateByEntity>()
5455
.Select((ur, ra, a) => new PermissionVo()
5556
{

0 commit comments

Comments
 (0)