Merge remote-tracking branch 'origin/master'

YunaiV · Apr 22, 2024 · ea4db88 · ea4db88
2 parents ce74fbc + 36a3147
commit ea4db88
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/...-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java b/...-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/MenuServiceImpl.java
@@ -11,6 +11,7 @@
 import cn.iocoder.yudao.module.system.service.tenant.TenantService;
 import com.google.common.annotations.VisibleForTesting;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.compress.utils.Lists;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.context.annotation.Lazy;
@@ -130,6 +131,10 @@ public MenuDO getMenu(Long id) {
 
     @Override
     public List<MenuDO> getMenuList(Collection<Long> ids) {
+        // 当ids为空时，返回一个空的实例对象
+        if (CollUtil.isEmpty(ids)) {
+            return Lists.newArrayList();
+        }
         return menuMapper.selectBatchIds(ids);
     }