From 4044988afa0761ca1e557849c017844fbbf9e21c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 04 九月 2024 16:16:53 +0800
Subject: [PATCH] update 优化 代码生成菜单id匹配写法
---
ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 e1e340f..bb8b444 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,7 +3,6 @@
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;
@@ -138,7 +137,7 @@
}
// 杩囨护骞惰浆鎹㈣〃鏍兼暟鎹�
List<GenTable> tables = tablesMap.values().stream()
- .filter(x -> !StringUtils.containsAnyIgnoreCase(x.getName(), TABLE_IGNORE))
+ .filter(x -> !startWithAnyIgnoreCase(x.getName(), TABLE_IGNORE))
.filter(x -> {
if (CollUtil.isEmpty(tableNames)) {
return true;
@@ -175,6 +174,16 @@
return TableDataInfo.build(page);
}
+ public static boolean startWithAnyIgnoreCase(CharSequence cs, CharSequence... searchCharSequences) {
+ // 鍒ゆ柇鏄惁鏄互鎸囧畾瀛楃涓插紑澶�
+ for (CharSequence searchCharSequence : searchCharSequences) {
+ if (StringUtils.startsWithIgnoreCase(cs, searchCharSequence)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
/**
* 鏌ヨ鎹簱鍒楄〃
*
@@ -196,7 +205,7 @@
.filter(x -> !StringUtils.containsAnyIgnoreCase(x.getName(), TABLE_IGNORE))
.filter(x -> tableNameSet.contains(x.getName())).toList();
- if (ArrayUtil.isEmpty(tableList)) {
+ if (CollUtil.isEmpty(tableList)) {
return new ArrayList<>();
}
return tableList.stream().map(x -> {
@@ -549,7 +558,7 @@
String treeCode = paramsObj.getStr(GenConstants.TREE_CODE);
String treeParentCode = paramsObj.getStr(GenConstants.TREE_PARENT_CODE);
String treeName = paramsObj.getStr(GenConstants.TREE_NAME);
- String parentMenuId = paramsObj.getStr(GenConstants.PARENT_MENU_ID);
+ Long parentMenuId = paramsObj.getLong(GenConstants.PARENT_MENU_ID);
String parentMenuName = paramsObj.getStr(GenConstants.PARENT_MENU_NAME);
genTable.setTreeCode(treeCode);
--
Gitblit v1.9.3