From caa81d1f4dbb0f608b7a6848e673eca2c4a69d10 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 24 五月 2021 16:12:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java | 3 ++-
ruoyi-generator/src/main/resources/vm/java/addBo.java.vm | 2 ++
ruoyi-generator/src/main/resources/vm/java/editBo.java.vm | 2 ++
3 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
index e71e889..f156e4f 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java
@@ -143,6 +143,7 @@
.set(cenTableColumn.getIsEdit() == null, GenTableColumn::getIsEdit, null)
.set(cenTableColumn.getIsList() == null, GenTableColumn::getIsList, null)
.set(cenTableColumn.getIsQuery() == null, GenTableColumn::getIsQuery, null)
+ .set(cenTableColumn.getIsRequired() == null, GenTableColumn::getIsRequired, null)
.eq(GenTableColumn::getColumnId,cenTableColumn.getColumnId()));
}
}
@@ -458,4 +459,4 @@
}
return genPath + File.separator + VelocityUtils.getFileName(template, table);
}
-}
\ No newline at end of file
+}
diff --git a/ruoyi-generator/src/main/resources/vm/java/addBo.java.vm b/ruoyi-generator/src/main/resources/vm/java/addBo.java.vm
index 41fa0e9..98a1497 100644
--- a/ruoyi-generator/src/main/resources/vm/java/addBo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/addBo.java.vm
@@ -29,11 +29,13 @@
#if($column.javaType == 'Date')
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
#end
+#if($column.isRequired==1)
#if($column.javaType == 'String')
@NotBlank(message = "$column.columnComment涓嶈兘涓虹┖")
#else
@NotNull(message = "$column.columnComment涓嶈兘涓虹┖")
#end
+#end
private $column.javaType $column.javaField;
#end
#end
diff --git a/ruoyi-generator/src/main/resources/vm/java/editBo.java.vm b/ruoyi-generator/src/main/resources/vm/java/editBo.java.vm
index 3f3d988..60b7e34 100644
--- a/ruoyi-generator/src/main/resources/vm/java/editBo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/editBo.java.vm
@@ -29,11 +29,13 @@
#if($column.javaType == 'Date')
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
#end
+#if($column.isRequired==1)
#if($column.javaType == 'String')
@NotBlank(message = "$column.columnComment涓嶈兘涓虹┖")
#else
@NotNull(message = "$column.columnComment涓嶈兘涓虹┖")
#end
+#end
private $column.javaType $column.javaField;
#end
#end
--
Gitblit v1.9.3