From 1ad851e4eb8c972eeb2fee7f2d1d54d3e32068a9 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Wed, 15 Jul 2020 09:48:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysRoleOrganizationServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysRoleOrganizationServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysRoleOrganizationServiceImpl.java
index 29d6233..d351487 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysRoleOrganizationServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysRoleOrganizationServiceImpl.java
@@ -201,16 +201,16 @@
public void getRoleOrg(Map<String, Object> params, SysUser user){
List<SysRole> roles = user.getRoles();
- List<Map<SysRole,List<SysRoleOrganization>>> listroleOrg=new ArrayList<>();
+ List<Map<Integer,List<SysRoleOrganization>>> listroleOrg=new ArrayList<>();
if (!roles.isEmpty()) {
roles.forEach(e->{
- Map<SysRole,List<SysRoleOrganization>> rolemap=new HashMap<>();
+ Map<Integer,List<SysRoleOrganization>> rolemap=new HashMap<>();
Map<String,Object> map=new HashMap<>();
map.put("role_id",e.getId());
List<SysRoleOrganization> sysRoleOrganizations = baseMapper.selectByMap(map);
if(sysRoleOrganizations.size()>0){
SysRole sysRole = sysRoleMapper.selectById(e.getId());
- rolemap.put(sysRole,sysRoleOrganizations);
+ rolemap.put(sysRole.getType(),sysRoleOrganizations);
listroleOrg.add(rolemap);
}
});
--
Gitblit v1.8.0