From ab9bc35f9f3e6fe2e57fe054aa0dc898fe9a8d2c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 02 九月 2021 15:45:57 +0800
Subject: [PATCH] update MP字段验证策略更改为 NOT_NULL 个别特殊字段使用注解单独处理

---
 ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
index d5f8ba8..2460360 100644
--- a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
+++ b/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java
@@ -44,6 +44,7 @@
     /**
      * 鍒楁弿杩�
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String columnComment;
 
     /**
@@ -65,36 +66,43 @@
     /**
      * 鏄惁涓婚敭锛�1鏄級
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String isPk;
 
     /**
      * 鏄惁鑷锛�1鏄級
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String isIncrement;
 
     /**
      * 鏄惁蹇呭~锛�1鏄級
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String isRequired;
 
     /**
      * 鏄惁涓烘彃鍏ュ瓧娈碉紙1鏄級
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String isInsert;
 
     /**
      * 鏄惁缂栬緫瀛楁锛�1鏄級
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String isEdit;
 
     /**
      * 鏄惁鍒楄〃瀛楁锛�1鏄級
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String isList;
 
     /**
      * 鏄惁鏌ヨ瀛楁锛�1鏄級
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     private String isQuery;
 
     /**
@@ -150,7 +158,7 @@
     private Map<String, Object> params = new HashMap<>();
 
     public String getCapJavaField() {
-        return StringUtils.upperFirst(javaField);
+        return StringUtils.uncapitalize(javaField);
     }
 
     public boolean isPk() {
@@ -231,7 +239,7 @@
     }
 
     public String readConverterExp() {
-        String remarks = StringUtils.subBetween(this.columnComment, "锛�", "锛�");
+        String remarks = StringUtils.substringBetween(this.columnComment, "锛�", "锛�");
         StringBuffer sb = new StringBuffer();
         if (StringUtils.isNotEmpty(remarks)) {
             for (String value : remarks.split(" ")) {

--
Gitblit v1.9.3