From 82fdb37c6b54fe591b04fea23b46a997921015fc Mon Sep 17 00:00:00 2001 From: AprilWind <2100166581@qq.com> Date: Fri, 19 Jul 2024 16:50:40 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E8=A1=A8=E5=90=8D=E4=B8=BA=E7=A9=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../generator/service/GenTableServiceImpl.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java index 3fcd33f4d..6ee23bd64 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java @@ -3,6 +3,7 @@ package org.dromara.generator.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.IoUtil; import cn.hutool.core.lang.Dict; +import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.dynamic.datasource.annotation.DSTransactional; @@ -124,8 +125,12 @@ public class GenTableServiceImpl implements IGenTableService { Integer pageNum = pageQuery.getPageNum(); Integer pageSize = pageQuery.getPageSize(); + LinkedHashMap tablesMap = ServiceProxy.metadata().tables(); + if (CollUtil.isEmpty(tablesMap)) { + return TableDataInfo.build(); + } // 过滤并转换表格数据 - List tables = ServiceProxy.metadata().tables().values().stream() + List tables = tablesMap.values().stream() .filter(x -> { boolean nameMatches = true; boolean commentMatches = true; @@ -167,9 +172,18 @@ public class GenTableServiceImpl implements IGenTableService { @Override public List selectDbTableListByNames(String[] tableNames, String dataName) { Set tableNameSet = new HashSet<>(List.of(tableNames)); - List tableList = ServiceProxy.metadata().tables().values().stream() + LinkedHashMap tablesMap = ServiceProxy.metadata().tables(); + + if (CollUtil.isEmpty(tablesMap)) { + return new ArrayList<>(); + } + + List
tableList = tablesMap.values().stream() .filter(x -> tableNameSet.contains(x.getName())).toList(); + if (ArrayUtil.isEmpty(tableList)) { + return new ArrayList<>(); + } return tableList.stream().map(x -> { GenTable gen = new GenTable(); gen.setDataName(dataName);