Commit 76f4cbdb by 李小龙

fixbug:28838 saas-租户管理-资源管理:新增/编辑里排序说明是从大到小排序,在资源管理列表、平台端菜单展示是从小到大,需要统一

parent 48dcbd46
......@@ -78,7 +78,7 @@ public class SaasPlatMenuController {
@Action(module = "saas端-租户资源管理(菜单)", name = "编辑", code = "saas:plat:menu:edit")
@ApiOperation("编辑")
@PostMapping("edit")
public ApiResponseEntity<?> edit(@Validated @RequestBody PlatMenuDTOVO dto){
public ApiResponseEntity<Void> edit(@Validated @RequestBody PlatMenuDTOVO dto){
platMenuService.edit(dto);
saasOperationLogService.add("saas端-租户资源管理-编辑", null);
......
......@@ -327,7 +327,7 @@ implements PlatRoleService {
List<PlatMenu> platMenuList = platMenuService.list(new QueryWrapper<PlatMenu>().lambda()
.in(StringUtils.isNotBlank(id), PlatMenu::getId, menuIdList)
//.orderByAsc(PlatMenu::getParentId)
.orderByAsc(PlatMenu::getSort)
.orderByDesc(PlatMenu::getSort)
.orderByAsc(PlatMenu::getCreateDate)
);
......
......@@ -475,7 +475,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
return platMenuService.list(new QueryWrapper<PlatMenu>().lambda()
.in(PlatMenu::getId, menuIdList)
.eq(PlatMenu::getStatus, CommonEnum.YES.getValue())
.orderByAsc(PlatMenu::getSort)
.orderByDesc(PlatMenu::getSort)
.orderByAsc(PlatMenu::getCreateDate)
);
}
......@@ -542,7 +542,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
List<PlatMenu> menuList = platMenuService.list(new QueryWrapper<PlatMenu>().lambda()
.in(PlatMenu::getId, menuIdList)
.eq(PlatMenu::getStatus, CommonEnum.YES.getValue())
.orderByAsc(PlatMenu::getSort)
.orderByDesc(PlatMenu::getSort)
.orderByAsc(PlatMenu::getCreateDate)
);
......
......@@ -70,7 +70,7 @@ public class PlatMenuServiceImpl extends ServiceImpl<PlatMenuMapper, PlatMenu>
.eq(StringUtils.isNotBlank(dto.getStatus()), PlatMenu::getStatus, dto.getStatus())
.in(StringUtils.isNotBlank(dto.getTenantId()), PlatMenu::getId, menuIdList)
//.orderByAsc(PlatMenu::getParentId)
.orderByAsc(PlatMenu::getSort)
.orderByDesc(PlatMenu::getSort)
.orderByAsc(PlatMenu::getCreateDate)
);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment