|
@@ -1,5 +1,6 @@
|
|
|
package cn.iocoder.yudao.module.system.controller.admin.permission;
|
|
package cn.iocoder.yudao.module.system.controller.admin.permission;
|
|
|
|
|
|
|
|
|
|
+import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
|
|
import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum;
|
|
|
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
|
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
|
|
|
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
|
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
|
@@ -11,7 +12,10 @@ import cn.iocoder.yudao.module.system.controller.admin.permission.vo.menu.MenuSi
|
|
|
import cn.iocoder.yudao.module.system.convert.auth.AuthConvert;
|
|
import cn.iocoder.yudao.module.system.convert.auth.AuthConvert;
|
|
|
import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO;
|
|
import cn.iocoder.yudao.module.system.dal.dataobject.permission.MenuDO;
|
|
|
import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO;
|
|
import cn.iocoder.yudao.module.system.dal.dataobject.permission.RoleDO;
|
|
|
|
|
+import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
|
|
|
|
|
+import cn.iocoder.yudao.module.system.enums.permission.MenuHideEnum;
|
|
|
import cn.iocoder.yudao.module.system.service.permission.MenuService;
|
|
import cn.iocoder.yudao.module.system.service.permission.MenuService;
|
|
|
|
|
+import cn.iocoder.yudao.module.system.service.user.AdminUserService;
|
|
|
import io.swagger.v3.oas.annotations.Operation;
|
|
import io.swagger.v3.oas.annotations.Operation;
|
|
|
import io.swagger.v3.oas.annotations.Parameter;
|
|
import io.swagger.v3.oas.annotations.Parameter;
|
|
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
@@ -21,12 +25,15 @@ import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
|
import javax.validation.Valid;
|
|
import javax.validation.Valid;
|
|
|
|
|
+import java.util.Arrays;
|
|
|
import java.util.Comparator;
|
|
import java.util.Comparator;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
import java.util.Set;
|
|
import java.util.Set;
|
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
|
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
|
|
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
|
|
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
|
|
|
|
|
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
|
|
|
|
|
|
|
|
@Tag(name = "管理后台 - 菜单")
|
|
@Tag(name = "管理后台 - 菜单")
|
|
|
@RestController
|
|
@RestController
|
|
@@ -37,6 +44,9 @@ public class MenuController {
|
|
|
@Resource
|
|
@Resource
|
|
|
private MenuService menuService;
|
|
private MenuService menuService;
|
|
|
|
|
|
|
|
|
|
+ @Resource
|
|
|
|
|
+ private AdminUserService userService;
|
|
|
|
|
+
|
|
|
@PostMapping("/create")
|
|
@PostMapping("/create")
|
|
|
@Operation(summary = "创建菜单")
|
|
@Operation(summary = "创建菜单")
|
|
|
@PreAuthorize("@ss.hasPermission('system:menu:create')")
|
|
@PreAuthorize("@ss.hasPermission('system:menu:create')")
|
|
@@ -77,6 +87,17 @@ public class MenuController {
|
|
|
public CommonResult<List<MenuSimpleRespVO>> getSimpleMenuList() {
|
|
public CommonResult<List<MenuSimpleRespVO>> getSimpleMenuList() {
|
|
|
List<MenuDO> list = menuService.getMenuListByTenant(
|
|
List<MenuDO> list = menuService.getMenuListByTenant(
|
|
|
new MenuListReqVO().setStatus(CommonStatusEnum.ENABLE.getStatus()));
|
|
new MenuListReqVO().setStatus(CommonStatusEnum.ENABLE.getStatus()));
|
|
|
|
|
+ // 不是平台管理员,移除指定的菜单
|
|
|
|
|
+ Long loginUserId = getLoginUserId();
|
|
|
|
|
+ if (loginUserId != null) {
|
|
|
|
|
+ AdminUserDO user = userService.getUser(loginUserId);
|
|
|
|
|
+ if (user != null) {
|
|
|
|
|
+ Set<String> nameSet = Arrays.stream(MenuHideEnum.values()).map(MenuHideEnum::getName).collect(Collectors.toSet());
|
|
|
|
|
+ if (CollUtil.isNotEmpty(nameSet) && !"oneportal_saas_管理员".equals(user.getRemark())) {
|
|
|
|
|
+ list.removeIf(menu -> nameSet.contains(menu.getName()));
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
list.sort(Comparator.comparing(MenuDO::getSort));
|
|
list.sort(Comparator.comparing(MenuDO::getSort));
|
|
|
return success(BeanUtils.toBean(list, MenuSimpleRespVO.class));
|
|
return success(BeanUtils.toBean(list, MenuSimpleRespVO.class));
|
|
|
}
|
|
}
|