cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://git.dayouqiantu.cn/yshopb2c/yshop into 3.0dev

Browse Source
This commit is contained in:
hupeng
2020-07-10 16:26:15 +08:00
parent a4eb134d03 31472e3792
commit 3c8b165786
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/MenuServiceImpl.java
View File

@ -313,7 +313,7 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, Menu> implement
throw new EntityExistException(Menu.class,"name",resources.getName()); 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(); int menuCount = this.lambdaQuery().eq(Menu::getComponentName,resources.getComponentName()).count();
if(menuCount > 1) throw new YshopException("请保持菜单组件名称唯一"); if(menuCount > 1) throw new YshopException("请保持菜单组件名称唯一");
menu1 = this.getOne(new QueryWrapper<Menu>().lambda() menu1 = this.getOne(new QueryWrapper<Menu>().lambda()

1
yshop-generator/src/main/java/co/yixiang/gen/service/impl/GeneratorServiceImpl.java
View File

@ -52,6 +52,7 @@ public class GeneratorServiceImpl extends BaseServiceImpl<ColumnInfoMapper, Colu
@Override @Override
public Object getTables(String name, Integer page, Integer size) { public Object getTables(String name, Integer page, Integer size) {
IPage<TableInfo> pages = null; IPage<TableInfo> pages = null;
if(page>=0)page = page + 1;
Page<TableInfo> pageModel = new Page<>(page, size); Page<TableInfo> pageModel = new Page<>(page, size);
pages = baseMapper.selectTablePage(pageModel,name); pages = baseMapper.selectTablePage(pageModel,name);
Integer totalElements = 0; Integer totalElements = 0;