From cf60a875646dbaaa7932f93286d8e708ed79c6dc Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期一, 18 七月 2022 17:39:33 +0800
Subject: [PATCH] update
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java
index 523656f..3777983 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java
@@ -1,6 +1,7 @@
package com.panzhihua.service_user.service.impl;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
@@ -116,9 +117,6 @@
}
queryWrapper.orderByDesc(SysRoleDO::getCreateAt);
IPage<SysRoleDO> sysRoleDOIPage=this.roleDAO.selectPage(new Page<>(pageNum,pageSize),queryWrapper);
- if (ObjectUtils.isEmpty(sysRoleDOIPage.getRecords())) {
- return R.fail("角色列表为空");
- }
return R.ok(sysRoleDOIPage);
}
@@ -295,13 +293,13 @@
BeanUtils.copyProperties(sysMenuDO2,sysMenuVO2);
sysMenuVOList.add(sysMenuVO2);
});
- sysMenuVO1.setSysMenuVOList(sysMenuVOList);
+ sysMenuVO1.setSysMenuVOList(sysMenuVOList.stream().sorted(Comparator.comparing(SysMenuVO::getOrderNum)).collect(Collectors.toList()));
menuVOS.add(sysMenuVO1);
});
- sysMenuVO.setSysMenuVOList(menuVOS);
+ sysMenuVO.setSysMenuVOList(menuVOS.stream().sorted(Comparator.comparing(SysMenuVO::getOrderNum)).collect(Collectors.toList()));
sysMenuVOS.add(sysMenuVO);
});
- return R.ok(sysMenuVOS);
+ return R.ok(sysMenuVOS.stream().sorted(Comparator.comparing(SysMenuVO::getOrderNum)).collect(Collectors.toList()));
}
/**
--
Gitblit v1.7.1