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

bug--新增菜单报错

Browse Source
This commit is contained in:
taochengbo
2020-05-23 00:05:44 +08:00
parent 0ac50aff91
commit 27b325b1f2
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -302,12 +302,8 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, Menu> implement
Menu menu = this.getById(resources.getId()); Menu menu = this.getById(resources.getId());
ValidationUtil.isNull(menu.getId(),"Permission","id",resources.getId()); ValidationUtil.isNull(menu.getId(),"Permission","id",resources.getId());
if(resources.getIFrame()){ isExitHttp(resources);
String http = "http://", https = "https://";
if (!(resources.getPath().toLowerCase().startsWith(http)||resources.getPath().toLowerCase().startsWith(https))) {
throw new BadRequestException("外链必须以http://或者https://开头");
}
}
Menu menu1 = this.getOne(new QueryWrapper<Menu>().eq("name",resources.getName())); Menu menu1 = this.getOne(new QueryWrapper<Menu>().eq("name",resources.getName()));
if(menu1 != null && !menu1.getId().equals(menu.getId())){ if(menu1 != null && !menu1.getId().equals(menu.getId())){
@ -320,6 +316,7 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, Menu> implement
throw new EntityExistException(Menu.class,"componentName",resources.getComponentName()); throw new EntityExistException(Menu.class,"componentName",resources.getComponentName());
} }
} }
menu.setId(resources.getId()); menu.setId(resources.getId());
menu.setName(resources.getName()); menu.setName(resources.getName());
menu.setComponent(resources.getComponent()); menu.setComponent(resources.getComponent());
@ -339,21 +336,29 @@ public class MenuServiceImpl extends BaseServiceImpl<MenuMapper, Menu> implement
@Override @Override
@CacheEvict(allEntries = true) @CacheEvict(allEntries = true)
public MenuDto create(Menu resources) { public MenuDto create(Menu resources) {
if(this.getOne(lambdaQuery().eq(Menu::getName,resources.getName())) != null){ isExitHttp(resources);
if(this.getOne(new QueryWrapper<Menu>().eq("name",resources.getName())) != null){
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())){
if(this.getOne(lambdaQuery().eq(Menu::getComponentName,resources.getComponentName())) != null){ if(this.getOne(new QueryWrapper<Menu>().eq("component_name",resources.getComponentName())) != null){
throw new EntityExistException(Menu.class,"componentName",resources.getComponentName()); throw new EntityExistException(Menu.class,"componentName",resources.getComponentName());
} }
} }
this.save(resources);
return generator.convert(resources,MenuDto.class);
}
/**
* 公共方法提取出来
* @param resources
*/
private void isExitHttp(Menu resources){
if(resources.getIFrame()){ if(resources.getIFrame()){
String http = "http://", https = "https://"; String http = "http://", https = "https://";
if (!(resources.getPath().toLowerCase().startsWith(http)||resources.getPath().toLowerCase().startsWith(https))) { if (!(resources.getPath().toLowerCase().startsWith(http)||resources.getPath().toLowerCase().startsWith(https))) {
throw new BadRequestException("外链必须以http://或者https://开头"); throw new BadRequestException("外链必须以http://或者https://开头");
} }
} }
this.save(resources);
return generator.convert(resources,MenuDto.class);
} }
} }