diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/MenuServiceImpl.java b/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/MenuServiceImpl.java index 4e9a43b9..03c3a204 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/MenuServiceImpl.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/MenuServiceImpl.java @@ -313,7 +313,7 @@ public class MenuServiceImpl extends BaseServiceImpl implement throw new EntityExistException(Menu.class,"name",resources.getName()); } - if(StringUtils.isNotBlank(resources.getComponentName())){ + if(StringUtils.isNotBlank(resources.getComponentName())&&resources.getType()!=0){ int menuCount = this.lambdaQuery().eq(Menu::getComponentName,resources.getComponentName()).count(); if(menuCount > 1) throw new YshopException("请保持菜单组件名称唯一"); menu1 = this.getOne(new QueryWrapper().lambda() diff --git a/yshop-generator/src/main/java/co/yixiang/gen/service/impl/GeneratorServiceImpl.java b/yshop-generator/src/main/java/co/yixiang/gen/service/impl/GeneratorServiceImpl.java index d27f2bc0..6e4219b3 100644 --- a/yshop-generator/src/main/java/co/yixiang/gen/service/impl/GeneratorServiceImpl.java +++ b/yshop-generator/src/main/java/co/yixiang/gen/service/impl/GeneratorServiceImpl.java @@ -52,6 +52,7 @@ public class GeneratorServiceImpl extends BaseServiceImpl pages = null; + if(page>=0)page = page + 1; Page pageModel = new Page<>(page, size); pages = baseMapper.selectTablePage(pageModel,name); Integer totalElements = 0;