From ef4e00d941103884eede0037c62a6739f68ed5d5 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 21 三月 2025 13:06:59 +0800
Subject: [PATCH] Merge branch 'front' of http://47.97.1.152:5880/r/wms-master into front
---
rsf-framework/src/main/java/com/vincent/rsf/framework/generators/ReactGenerator.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/rsf-framework/src/main/java/com/vincent/rsf/framework/generators/ReactGenerator.java b/rsf-framework/src/main/java/com/vincent/rsf/framework/generators/ReactGenerator.java
index 60128b4..ab7132d 100644
--- a/rsf-framework/src/main/java/com/vincent/rsf/framework/generators/ReactGenerator.java
+++ b/rsf-framework/src/main/java/com/vincent/rsf/framework/generators/ReactGenerator.java
@@ -387,6 +387,9 @@
boolean setTableId = true;
boolean setDateTimeFormat = true;
for (Column column : columns){
+// System.out.println("------==========>");
+// System.out.println(column.getName());
+// System.out.println(column.getType());
if (column.getType().equals("Date")){
entityIm.append("import java.text.SimpleDateFormat;\n")
.append("import java.util.Date;\n");
@@ -520,7 +523,7 @@
}
// 澶栭敭淇グ
- if (!Cools.isEmpty(column.getForeignKeyMajor())){
+ if (!Cools.isEmpty(column.getForeignKey()) && !column.getForeignKey().equals("Tenant")){
sb.append(" public String get").append(column.getHumpName().substring(0, 1).toUpperCase()).append(column.getHumpName().substring(1)).append("\\$").append("(){\n")
.append(" ").append(column.getForeignKey()).append("Service service = SpringUtils.getBean(").append(column.getForeignKey()).append("Service.class);\n")
.append(" ").append(column.getForeignKey()).append(" ").append(GeneratorUtils.firstCharConvert(column.getForeignKey()))
--
Gitblit v1.9.1