fix Table40

getrebuild · Jan 22, 2025 · efaf53e · efaf53e
1 parent d144680
commit efaf53e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/main/java/com/rebuild/core/metadata/impl/Entity2Schema.java b/src/main/java/com/rebuild/core/metadata/impl/Entity2Schema.java
@@ -274,12 +274,17 @@ private Field createBuiltinField(Entity entity, String fieldName, String fieldLa
      */
     private boolean schema2Database(Entity entity) {
         Dialect dialect = Application.getPersistManagerFactory().getDialect();
-        List<String> ixs = Arrays.asList(
-                EntityHelper.QuickCode, EntityHelper.OwningUser, EntityHelper.OwningDept, EntityHelper.CreatedOn, EntityHelper.ModifiedOn);
+        List<String> ixs = Arrays.asList(EntityHelper.CreatedOn, EntityHelper.ModifiedOn);
+        if (entity.getMainEntity() != null) {
+            ixs.add(EntityHelper.QuickCode);
+            ixs.add(EntityHelper.OwningUser);
+            ixs.add(EntityHelper.OwningDept);
+        }
         Table table = new Table40(entity, dialect, ixs);
-        String[] ddls = table.generateDDL(false, false, false);
 
+        String[] ddls = null;
         try {
+            ddls = table.generateDDL(false, false, false);
             Application.getSqlExecutor().executeBatch(ddls, DDL_TIMEOUT);
         } catch (Throwable ex) {
             log.error("DDL Error : \n{}", StringUtils.join(ddls, "\n"), ex);

diff --git a/src/main/java/com/rebuild/core/metadata/impl/Table40.java b/src/main/java/com/rebuild/core/metadata/impl/Table40.java
@@ -12,6 +12,7 @@
 import cn.devezhao.persist4j.dialect.Dialect;
 import cn.devezhao.persist4j.util.XmlHelper;
 import cn.devezhao.persist4j.util.support.Table;
+import org.apache.commons.collections4.CollectionUtils;
 import org.dom4j.Element;
 
 import java.util.ArrayList;
@@ -34,7 +35,7 @@ public Table40(Entity entity, Dialect dialect, List<String> indexFields) {
     }
 
     private static List<Element> buildIndexList(List<String> indexFields) {
-        if (indexFields == null || indexFields.isEmpty()) return null;
+        if (CollectionUtils.isEmpty(indexFields)) return null;
 
         List<Element> ixs = new ArrayList<>();
         for (String indexField : indexFields) {