Commit 7f3c647b by liulianglang

角色查询隐藏

parent 31f3d25e
......@@ -112,9 +112,9 @@
</dependency>
<!-- 数据库驱动包 -->
<dependency>
<groupId>org.oracle</groupId>
<groupId>com.oracle</groupId>
<artifactId>ojdbc6</artifactId>
<version>10</version>
<version>11.2.0.3</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.jasypt/jasypt -->
<dependency>
......
......@@ -176,33 +176,33 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
// userNew.setUserRolesStr(str);
// }
// }
if (Func.isNotEmpty(userNew)) {
// 根据用户查询角色名称
List<Map<String, String>> userRolesName = sysUserMapper.getUserRoles(userNew.getId());
if(userRolesName!=null && userRolesName.size()>0){
ArrayList<String> nameList = new ArrayList<>();
ArrayList<String> idList = new ArrayList<>();
for (Map<String, String> map : userRolesName) {
nameList.add(map.get("roleName"));
idList.add(map.get("roleId"));
}
String str = StringUtils.join(nameList, ",");
userNew.setUserRoles(idList);
userNew.setUserRolesStr(str);
List<Map<String, String>> userMenusName = sysUserMapper.getUserMenus(idList);
if (userMenusName != null && userMenusName.size() > 0){
ArrayList<String> menuNameList = new ArrayList<>();
ArrayList<String> menuCodeList = new ArrayList<>();
for (Map<String, String> map : userMenusName) {
menuNameList.add(map.get("menuName"));
menuCodeList.add(map.get("menuCode"));
}
String menuStr = StringUtils.join(menuNameList, ",");
userNew.setUserMenus(menuCodeList);
userNew.setUserMenusStr(menuStr);
}
}
}
// if (Func.isNotEmpty(userNew)) {
////// 根据用户查询角色名称
//// List<Map<String, String>> userRolesName = sysUserMapper.getUserRoles(userNew.getId());
//// if(userRolesName!=null && userRolesName.size()>0){
//// ArrayList<String> nameList = new ArrayList<>();
//// ArrayList<String> idList = new ArrayList<>();
//// for (Map<String, String> map : userRolesName) {
//// nameList.add(map.get("roleName"));
//// idList.add(map.get("roleId"));
//// }
//// String str = StringUtils.join(nameList, ",");
//// userNew.setUserRoles(idList);
//// userNew.setUserRolesStr(str);
//// List<Map<String, String>> userMenusName = sysUserMapper.getUserMenus(idList);
//// if (userMenusName != null && userMenusName.size() > 0){
//// ArrayList<String> menuNameList = new ArrayList<>();
//// ArrayList<String> menuCodeList = new ArrayList<>();
//// for (Map<String, String> map : userMenusName) {
//// menuNameList.add(map.get("menuName"));
//// menuCodeList.add(map.get("menuCode"));
//// }
//// String menuStr = StringUtils.join(menuNameList, ",");
//// userNew.setUserMenus(menuCodeList);
//// userNew.setUserMenusStr(menuStr);
//// }
//// }
//// }
userInfo.setUser(userNew);
if (userNew != null) {
userInfo.setPermissions(userNew.getUserMenus());
......
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 to comment