From e95a1245c50310036b618f9fa1cd221e9eaa5811 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 26 九月 2022 08:29:03 +0800
Subject: [PATCH] 若依 3.8.4
---
ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
index f5ba157..e28c0bb 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java
@@ -42,6 +42,7 @@
column.setJavaField(StringUtils.toCamelCase(columnName));
// 设置默认类型
column.setJavaType(GenConstants.TYPE_STRING);
+ column.setQueryType(GenConstants.QUERY_EQ);
if (arraysContains(GenConstants.COLUMNTYPE_STR, dataType) || arraysContains(GenConstants.COLUMNTYPE_TEXT, dataType))
{
@@ -112,10 +113,15 @@
{
column.setHtmlType(GenConstants.HTML_SELECT);
}
- // 图片字段设置单图控件
+ // 图片字段设置图片上传控件
else if (StringUtils.endsWithIgnoreCase(columnName, "image"))
{
column.setHtmlType(GenConstants.HTML_IMAGE_UPLOAD);
+ }
+ // 文件字段设置文件上传控件
+ else if (StringUtils.endsWithIgnoreCase(columnName, "file"))
+ {
+ column.setHtmlType(GenConstants.HTML_FILE_UPLOAD);
}
// 内容字段设置富文本控件
else if (StringUtils.endsWithIgnoreCase(columnName, "content"))
@@ -146,8 +152,7 @@
{
int lastIndex = packageName.lastIndexOf(".");
int nameLength = packageName.length();
- String moduleName = StringUtils.substring(packageName, lastIndex + 1, nameLength);
- return moduleName;
+ return StringUtils.substring(packageName, lastIndex + 1, nameLength);
}
/**
@@ -160,8 +165,7 @@
{
int lastIndex = tableName.lastIndexOf("_");
int nameLength = tableName.length();
- String businessName = StringUtils.substring(tableName, lastIndex + 1, nameLength);
- return businessName;
+ return StringUtils.substring(tableName, lastIndex + 1, nameLength);
}
/**
--
Gitblit v1.9.2