Merge remote-tracking branch 'origin/master'

hsweb-commons/hsweb-commons-service/hsweb-commons-service-simple/src/main/java/org/hswebframework/web/service/AbstractTreeSortService.java

@@ -54,13 +54,23 @@ public abstract class AbstractTreeSortService<E extends TreeSortSupportEntity<PK
         return createQuery().where(TreeSupportEntity.parentId, parentId).noPaging().list();
     }
 
+    //当父节点不存在时,创建parentId
+    @SuppressWarnings("unchecked")
+    protected PK createParentIdOnExists() {
+        if (getPrimaryKeyType() == String.class) {
+            return (PK) "-1";
+        }
+        return null;
+    }
+
     protected void applyPath(E entity) {
         if (!StringUtils.isEmpty(entity.getParentId())) return;
         if (!StringUtils.isEmpty(entity.getPath())) return;
 
         TreeSortSupportEntity<PK> parent = selectByPk(entity.getParentId());
         if (null == parent) {
-            entity.setParentId(null);
+            entity.setParentId(createParentIdOnExists());
+            entity.setPath(RandomUtil.randomChar(4));
         } else {
             entity.setPath(parent.getPath() + "-" + RandomUtil.randomChar(4));
         }

hsweb-system/hsweb-system-file/hsweb-system-file-starter/src/main/resources/hsweb-starter.js

@@ -29,7 +29,7 @@ function install(context) {
         .addColumn().name("size").alias("size").comment("文件大小").jdbcType(java.sql.JDBCType.DECIMAL).length(32, 0).commit()
         .addColumn().name("status").alias("status").comment("状态").jdbcType(java.sql.JDBCType.DECIMAL).length(4, 0).commit()
         .addColumn().name("classified").alias("classified").comment("分类").jdbcType(java.sql.JDBCType.VARCHAR).length(32).commit()
-        .addColumn().name("create_time").alias("create_time").comment("创建时间").jdbcType(java.sql.JDBCType.NUMERIC).length(32).commit()
+        .addColumn().name("create_time").alias("create_time").comment("创建时间").jdbcType(java.sql.JDBCType.NUMERIC).length(32,0).commit()
         .addColumn().name("creator_id").alias("creatorId").comment("创建人").jdbcType(java.sql.JDBCType.VARCHAR).length(256).commit()
         .comment("文件信息").commit();
 }