|
@@ -35,7 +35,7 @@ public class UserRoleServiceImpl extends ServiceImpl<UserRoleMapper, UserRole> i
|
|
|
public Page<UserRole> roles(String keyword, Long page, Long pageSize){
|
|
|
|
|
|
List<UserRole> userRoles = lambdaQuery().gt(UserRole::getRoleId, 1).list().stream().peek(role -> {
|
|
|
- role.setMenus(menusService.lambdaQuery().in(Menus::getId, Arrays.asList(role.getMenuId().split(","))).list());
|
|
|
+ role.setMenus(menusService.lambdaQuery().in(Menus::getId, Arrays.asList(role.getMenuId().split(","))).orderByAsc(Menus::getSortBy).list());
|
|
|
}).filter(role -> {
|
|
|
for (Menus menu : role.getMenus()) {
|
|
|
if (menu.getTitle().contains(keyword)) {
|