From c6232cfc36e373f83f45c95d400e09466cc2a7d3 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 14 十月 2022 17:41:45 +0800
Subject: [PATCH] #feat 修改运营平台统计登录人数和新增人员
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/RoleServiceImpl.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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..9194cfe 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);
}
@@ -178,7 +176,13 @@
* @return 菜单集合
*/
@Override
- public R listMenuBackstage(Long communityId) {
+ public R listMenuBackstage(Long communityId,String appId) {
+ if("wx118de8a734d269f0".equals(appId)){
+ communityId=2L;
+ }
+ else {
+ communityId=1552661941170868228L;
+ }
List<SysMenuVO> sysMenuVOS = new ArrayList<>();
List<SysMenuDO> sysMenuDOS =
sysMenuDAO.selectList(new QueryWrapper<SysMenuDO>().lambda().eq(SysMenuDO::getParentId, 0)
@@ -295,13 +299,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