Administrator 4 жил өмнө
parent
commit
3706564d7e

+ 1 - 1
boman-modules/boman-gen/src/main/java/com/boman/gen/domain/GenTableColumn.java

@@ -45,7 +45,7 @@ public class GenTableColumn extends BaseEntity
     private String javaType;
 
     /** JAVA字段名 */
-    @NotBlank(message = "Java属性不能为空")
+    //@NotBlank(message = "Java属性不能为空")
     private String javaField;
 
     /** 是否主键(1是) */

+ 1 - 1
boman-modules/boman-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml

@@ -179,7 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
 
-    <select id="checkColumnNameUnique" parameterType="Long" resultType="com.boman.gen.domain.GenTableColumn">
+    <select id="checkColumnNameUnique" parameterType="String" resultType="com.boman.gen.domain.GenTableColumn">
         <include refid="selectGenTableColumnVo"/>
         where column_name = #{columnName} limit 1
     </select>

+ 1 - 1
boman-web-core/src/main/java/com/boman/web/core/utils/ColumnUtils.java

@@ -88,7 +88,7 @@ public class ColumnUtils {
      */
     public static JSONArray filterData(List<GenTableColumn> allColumns, int sort, JSONArray data, Predicate<String> predicate) {
         assert sort < 6;
-        JSONArray returnData = new JSONArray(data.size());
+        JSONArray returnData = new JSONArray();
         boolean dataIsEmpty = isEmpty(data);
         if (dataIsEmpty) {
             // data为空,拿出所有列中列表可见的