diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java index 8328149a..fd2d9818 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java @@ -184,8 +184,8 @@ public class SysMenuController extends BaseController { /** * 复制菜单 */ - @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) - @SaCheckPermission("system:menu:add") +// @SaCheckRole(TenantConstants.SUPER_ADMIN_ROLE_KEY) +// @SaCheckPermission("system:menu:add") @Log(title = "菜单管理", businessType = BusinessType.INSERT) @PostMapping("/copy/{menuId}") public R copy(@PathVariable("menuId") Long menuId, @RequestBody SysMenuBo menu) { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPrintTemplateNodeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPrintTemplateNodeServiceImpl.java index b731b13a..b8aa7a31 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPrintTemplateNodeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPrintTemplateNodeServiceImpl.java @@ -160,17 +160,9 @@ public class SysPrintTemplateNodeServiceImpl implements ISysPrintTemplateNodeSer return 0; } - List idList = bos.stream() - .map(bo -> { - String id = bo.getId(); - if (StringUtils.isEmpty(id)) { - throw new ServiceException("节点ID不可为空!"); - } - return id; - }) - .distinct() - .collect(Collectors.toList()); - List existingNodes = this.queryListByIds(idList); + SysPrintTemplateNodeBo nodeBo = new SysPrintTemplateNodeBo(); + nodeBo.setTemplateInfoId(bos.get(0).getTemplateInfoId()); + List existingNodes = this.queryList(nodeBo); Set templateNodeIds = existingNodes.stream() .map(SysPrintTemplateNodeVo::getTemplateNodeId) .collect(Collectors.toSet());