From 64c78dfb2c57ab858232302bbfa3d9977dd72ba1 Mon Sep 17 00:00:00 2001 From: kenhy Date: Fri, 10 Jul 2020 15:22:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95=E7=9B=AE=E5=BD=95=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../co/yixiang/modules/system/service/impl/MenuServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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() From 31472e379216fa0b888c811cd3ec7815f6fea5b9 Mon Sep 17 00:00:00 2001 From: kenhy Date: Fri, 10 Jul 2020 15:48:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=AC=AC1=E3=80=812=E9=A1=B5=E7=9B=B8?= =?UTF-8?q?=E5=90=8C=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/co/yixiang/gen/service/impl/GeneratorServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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;