From 9140edf9b115a6b38c599878093d595ef84228f1 Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Sun, 12 Jul 2020 17:10:34 +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 | 20 +++++++++++++++++---
1 files changed, 17 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 f9cf315..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
@@ -192,18 +192,25 @@
}
return listMap;
}
+
+ /**
+ * 将权限 分装到map对像
+ * @param params
+ * @param user
+ */
+
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);
}
});
@@ -211,4 +218,11 @@
//添加权限控制
params.put("roleOrg",listroleOrg);
}
+
+ @Override
+ public Map<String, Object> getRoleOrgMap(SysUser user) {
+ Map<String, Object> map=new HashMap<>();
+ getRoleOrg(map,user);
+ return map;
+ }
}
--
Gitblit v1.8.0