diff --git a/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/biz/AdminSysMenuBiz.java b/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/biz/AdminSysMenuBiz.java index 842c0d3944228ae6bb0dcc686d425861c7035501..ec336eefc3bb26a45a568779660191f4e7840bd1 100644 --- a/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/biz/AdminSysMenuBiz.java +++ b/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/biz/AdminSysMenuBiz.java @@ -55,7 +55,7 @@ public class AdminSysMenuBiz { c.andStatusIdEqualTo(req.getStatusId()); } example.setOrderByClause("sort asc, id desc"); - List sysMenuList = dao.listByExample(example); + List sysMenuList = dao.selectByExampleWithBLOBs(example); return Result.success(filter(0L, sysMenuList)); } diff --git a/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/biz/AdminSysUserBiz.java b/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/biz/AdminSysUserBiz.java index 22eb32fa0933c1aa0b5bece7b1de01b0c38d36c3..928cc1b6839fc463e0bbc6f1eccccd42fae494a1 100644 --- a/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/biz/AdminSysUserBiz.java +++ b/roncoo-education-system/roncoo-education-system-service/src/main/java/com/roncoo/education/system/service/admin/biz/AdminSysUserBiz.java @@ -62,15 +62,15 @@ public class AdminSysUserBiz { List roleList = sysRoleDao.listByIds(roles); Map roleNameMap = null; if (CollUtil.isNotEmpty(roleList)) { - roleNameMap = roleList.stream().collect(Collectors.toMap(SysRole::getId, SysRole::getRoleName)); + roleNameMap = roleList.stream().collect(Collectors.toMap(SysRole::getId, SysRole::getRoleName)); } Map> map = roleUserList.stream().collect(Collectors.groupingBy(SysRoleUser::getUserId, Collectors.mapping(SysRoleUser::getRoleId, Collectors.toList()))); - for(AdminSysUserPageResp resp: respPage.getList()){ + for (AdminSysUserPageResp resp : respPage.getList()) { List roleIdList = map.get(resp.getId()); - if(CollUtil.isNotEmpty(roleIdList)){ + if (CollUtil.isNotEmpty(roleIdList)) { List roleNameList = new ArrayList<>(); - for(Long roleId: roleIdList){ - if( null !=roleNameMap){ + for (Long roleId : roleIdList) { + if (null != roleNameMap) { roleNameList.add(roleNameMap.get(roleId)); } }