Merge branch 'master' of https://git.dayouqiantu.cn/yshopb2c/yshop into 3.0dev
This commit is contained in:
@ -313,7 +313,7 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, Menu> 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<Menu>().lambda()
|
||||
|
@ -52,6 +52,7 @@ public class GeneratorServiceImpl extends BaseServiceImpl<ColumnInfoMapper, Colu
|
||||
@Override
|
||||
public Object getTables(String name, Integer page, Integer size) {
|
||||
IPage<TableInfo> pages = null;
|
||||
if(page>=0)page = page + 1;
|
||||
Page<TableInfo> pageModel = new Page<>(page, size);
|
||||
pages = baseMapper.selectTablePage(pageModel,name);
|
||||
Integer totalElements = 0;
|
||||
|
Reference in New Issue
Block a user