Merge remote-tracking branch 'base-version/main' into dev

This commit is contained in:
chenbowen
2025-09-23 10:17:18 +08:00
4 changed files with 28 additions and 18 deletions

View File

@@ -3,6 +3,8 @@ package com.zt.plat.module.system.service.permission;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Lists;
import com.zt.plat.framework.common.enums.CommonStatusEnum;
import com.zt.plat.framework.common.util.object.BeanUtils;
import com.zt.plat.module.system.controller.admin.permission.vo.menu.MenuListReqVO;
@@ -12,8 +14,6 @@ import com.zt.plat.module.system.dal.mysql.permission.MenuMapper;
import com.zt.plat.module.system.dal.redis.RedisKeyConstants;
import com.zt.plat.module.system.enums.permission.MenuTypeEnum;
import com.zt.plat.module.system.service.tenant.TenantService;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.Lists;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cache.annotation.CacheEvict;
@@ -256,7 +256,12 @@ public class MenuServiceImpl implements MenuService {
if (StrUtil.isBlank(componentName)) {
return;
}
MenuDO menu = menuMapper.selectByComponentName(componentName);
MenuDO menu = null;
try {
menu = menuMapper.selectByComponentName(componentName);
} catch (Exception e) {
throw exception(MENU_COMPONENT_NAME_DUPLICATE);
}
if (menu == null) {
return;
}