角色修改

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/SysUserRoleServiceImpl.java

@@ -65,36 +65,12 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
     public List<MenuDto> listByUserId() {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         List<SysRole> sysRole = sysRoleService.listRolesByUserId(sysUser.getId());
-        List<MenuDto> menuDtoList = null;
         for (SysRole role : sysRole) {
             if (Objects.nonNull(role.getType()) && RoleTypeEnum.ADMIN.name().equals(role.getType().name())) {
                 return this.baseMapper.listAll(Objects.isNull(sysUser.getSchoolId()) ? (Long) ServletUtil.getRequestSchoolByNotVaild() : sysUser.getSchoolId());
             }
         }
-        LinkedMultiValueMap<Long, LinkedMultiValueMap<PrivilegeEnum, MenuDto>> linkedMultiValueMap = new LinkedMultiValueMap<>();
-        menuDtoList = this.baseMapper.listByUserId(sysUser.getId(), Objects.isNull(sysUser.getSchoolId()) ? (Long) ServletUtil.getRequestSchoolByNotVaild() : sysUser.getSchoolId());
-//        LinkedMultiValueMap<PrivilegeEnum, MenuDto> menuDtoLinkedMultiValueMap = null;
-//        for (MenuDto m : menuDtoList) {
-//            if (!linkedMultiValueMap.containsKey(m.getParentId())) {
-//                menuDtoLinkedMultiValueMap = new LinkedMultiValueMap<>();
-//                menuDtoLinkedMultiValueMap.add(m.getType(), m);
-//                linkedMultiValueMap.add(m.getParentId(), menuDtoLinkedMultiValueMap);
-//            } else {
-//                List<LinkedMultiValueMap<PrivilegeEnum, MenuDto>> menuDtos = linkedMultiValueMap.get(m.getParentId());
-//                for (int i = 0; i < menuDtos.size(); i++) {
-//                    menuDtoLinkedMultiValueMap = menuDtos.get(i);
-//                    if (menuDtoLinkedMultiValueMap.containsKey(m.getType())) {
-//                        menuDtoLinkedMultiValueMap.add(m.getType(), m);
-//                        break;
-//                    } else {
-//                        menuDtoLinkedMultiValueMap = new LinkedMultiValueMap<>();
-//                        menuDtoLinkedMultiValueMap.add(m.getType(), m);
-//                        linkedMultiValueMap.add(m.getParentId(), menuDtoLinkedMultiValueMap);
-//                    }
-//                }
-//            }
-//        }
-        return menuDtoList;
+        return this.baseMapper.listByUserId(sysUser.getId(), Objects.isNull(sysUser.getSchoolId()) ? (Long) ServletUtil.getRequestSchoolByNotVaild() : sysUser.getSchoolId());
     }
 
     @Override