|
|
|
@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers; |
|
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
|
|
|
|
import lombok.AllArgsConstructor; |
|
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
import org.springblade.core.log.exception.ServiceException; |
|
|
|
|
import org.springblade.core.secure.BladeUser; |
|
|
|
|
import org.springblade.core.secure.utils.AuthUtil; |
|
|
|
@ -56,6 +57,7 @@ import static org.springblade.core.cache.constant.CacheConstant.MENU_CACHE;
|
|
|
|
|
*/ |
|
|
|
|
@Service |
|
|
|
|
@AllArgsConstructor |
|
|
|
|
@Slf4j |
|
|
|
|
public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IMenuService { |
|
|
|
|
|
|
|
|
|
private final IRoleMenuService roleMenuService; |
|
|
|
@ -266,6 +268,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
|
|
|
|
|
|
|
|
|
|
@Override |
|
|
|
|
public boolean submit(Menu menu) { |
|
|
|
|
log.info("menu1:{}", menu); |
|
|
|
|
LambdaQueryWrapper<Menu> menuQueryWrapper = Wrappers.lambdaQuery(); |
|
|
|
|
if (menu.getId() == null) { |
|
|
|
|
menuQueryWrapper.eq(Menu::getCode, menu.getCode()).or( |
|
|
|
@ -282,9 +285,11 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
|
|
|
|
|
if (cnt > 0L) { |
|
|
|
|
throw new ServiceException("菜单名或编号已存在!"); |
|
|
|
|
} |
|
|
|
|
if (menu.getParentId() == null || menu.getId() == null) { |
|
|
|
|
if (menu.getParentId() == null ) { |
|
|
|
|
menu.setParentId(BladeConstant.TOP_PARENT_ID); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (menu.getParentId() != null || menu.getId() == null) { |
|
|
|
|
Menu parentMenu = baseMapper.selectById(menu.getParentId()); |
|
|
|
|
if (parentMenu != null && parentMenu.getCategory() != 1) { |
|
|
|
@ -292,6 +297,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
menu.setIsDeleted(BladeConstant.DB_NOT_DELETED); |
|
|
|
|
log.info("menu2:{}", menu); |
|
|
|
|
return saveOrUpdate(menu); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|