From 5e6fd0d1e148554c94d30ba7ed4ffe2eddc07c78 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期六, 12 二月 2022 11:56:02 +0800
Subject: [PATCH] !429 修复自定义组件`file-upload`无法显示第一个文件，列表显示的文件比实际文件少一个的问题 Merge pull request !429 from hjk2008/master
---
ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
index 1dadf2c..6bce127 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
@@ -3,6 +3,7 @@
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import org.apache.velocity.VelocityContext;
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.constant.GenConstants;
@@ -227,8 +228,7 @@
public static String getPackagePrefix(String packageName)
{
int lastIndex = packageName.lastIndexOf(".");
- String basePackage = StringUtils.substring(packageName, 0, lastIndex);
- return basePackage;
+ return StringUtils.substring(packageName, 0, lastIndex);
}
/**
@@ -270,7 +270,7 @@
public static String getDicts(GenTable genTable)
{
List<GenTableColumn> columns = genTable.getColumns();
- List<String> dicts = new ArrayList<String>();
+ Set<String> dicts = new HashSet<String>();
for (GenTableColumn column : columns)
{
if (!column.isSuperColumn() && StringUtils.isNotEmpty(column.getDictType()) && StringUtils.equalsAny(
--
Gitblit v1.9.2