fix column类中相关方法

boman-api/boman-domain/src/main/java/com.boman.domain/GenTableColumn.java

@@ -416,7 +416,7 @@ public class GenTableColumn extends BaseEntity
 //    {
 //        return isList(this.isList);
 //    }
-
+//
 //    public boolean isList(String isList)
 //    {
 //        return isList != null && StringUtils.equals("1", isList);
@@ -486,7 +486,7 @@ public class GenTableColumn extends BaseEntity
 //    {
 //        return isSuperColumn(this.javaField);
 //    }
-
+//
 //    public static boolean isSuperColumn(String javaField)
 //    {
 //        return StringUtils.equalsAnyIgnoreCase(javaField,

boman-modules/boman-gen/src/main/java/com/boman/gen/service/GenTableServiceImpl.java

@@ -591,7 +591,7 @@ public class GenTableServiceImpl implements IGenTableService {
      */
     public void setPkColumn(GenTable table) {
         for (GenTableColumn column : table.getColumns()) {
-            if (column.isPk()) {
+            if (column.getIsPk().equals(UserConstants.INCREMENT)) {
                 table.setPkColumn(column);
                 break;
             }
@@ -601,7 +601,7 @@ public class GenTableServiceImpl implements IGenTableService {
         }
         if (GenConstants.TPL_SUB.equals(table.getTplCategory())) {
             for (GenTableColumn column : table.getSubTable().getColumns()) {
-                if (column.isPk()) {
+                if (column.getIsPk().equals(UserConstants.INCREMENT)) {
                     table.getSubTable().setPkColumn(column);
                     break;
                 }

boman-modules/boman-gen/src/main/java/com/boman/gen/util/GenUtils.java

@@ -1,6 +1,7 @@
 package com.boman.gen.util;
 
 import com.boman.common.core.constant.GenConstants;
+import com.boman.common.core.constant.UserConstants;
 import com.boman.common.core.utils.StringUtils;
 import com.boman.gen.config.GenConfig;
 import com.boman.domain.GenTable;
@@ -82,17 +83,17 @@ public class GenUtils
         column.setIsInsert(GenConstants.REQUIRE);
 
         // 编辑字段
-        if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName) && !column.isPk())
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_EDIT, columnName) && !column.getIsPk().equals(UserConstants.INCREMENT))
         {
             column.setIsEdit(GenConstants.REQUIRE);
         }
         // 列表字段
-        if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName) && !column.isPk())
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_LIST, columnName) && !column.getIsPk().equals(UserConstants.INCREMENT))
         {
             column.setIsList(GenConstants.REQUIRE);
         }
         // 查询字段
-        if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.isPk())
+        if (!arraysContains(GenConstants.COLUMNNAME_NOT_QUERY, columnName) && !column.getIsPk().equals(UserConstants.INCREMENT))
         {
             column.setIsQuery(GenConstants.REQUIRE);
         }

boman-modules/boman-gen/src/main/java/com/boman/gen/util/VelocityUtils.java

@@ -247,12 +247,12 @@ public class VelocityUtils
         }
         for (GenTableColumn column : columns)
         {
-            if (!column.isSuperColumn() && GenConstants.TYPE_DATE.equals(column.getJavaType()))
+            if (!isSuperColumn(column.getJavaField()) && GenConstants.TYPE_DATE.equals(column.getJavaType()))
             {
                 importList.add("java.util.Date");
                 importList.add("com.fasterxml.jackson.annotation.JsonFormat");
             }
-            else if (!column.isSuperColumn() && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType()))
+            else if (!isSuperColumn(column.getJavaField()) && GenConstants.TYPE_BIGDECIMAL.equals(column.getJavaType()))
             {
                 importList.add("java.math.BigDecimal");
             }
@@ -260,6 +260,15 @@ public class VelocityUtils
         return importList;
     }
 
+    public static boolean isSuperColumn(String javaField)
+    {
+        return StringUtils.equalsAnyIgnoreCase(javaField,
+                // BaseEntity
+                "createBy", "createTime", "updateBy", "updateTime", "remark",
+                // TreeEntity
+                "parentName", "parentId", "orderNum", "ancestors");
+    }
+
     /**
      * 获取权限前缀
      *
@@ -346,7 +355,7 @@ public class VelocityUtils
         int num = 0;
         for (GenTableColumn column : genTable.getColumns())
         {
-            if (column.isList())
+            if (column.getIsList() != null && StringUtils.equals("1", column.getIsList()))
             {
                 num++;
                 String columnName = column.getColumnName();