Browse Source

优化sortindex

zhou-hao 7 years ago
parent
commit
49faf1fc91

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

@@ -73,9 +73,13 @@ public abstract class AbstractTreeSortService<E extends TreeSortSupportEntity<PK
 
 
         TreeSortSupportEntity<PK> parent = selectByPk(entity.getParentId());
         TreeSortSupportEntity<PK> parent = selectByPk(entity.getParentId());
         if (null == parent) {
         if (null == parent) {
+            if (entity.getSortIndex() == null)
+                entity.setSortIndex(0L);
             entity.setParentId(createParentIdOnExists());
             entity.setParentId(createParentIdOnExists());
             entity.setPath(RandomUtil.randomChar(4));
             entity.setPath(RandomUtil.randomChar(4));
         } else {
         } else {
+            if (entity.getSortIndex() == null&&parent.getSortIndex()!=null)
+                entity.setSortIndex(parent.getSortIndex() * 10);
             entity.setPath(parent.getPath() + "-" + RandomUtil.randomChar(4));
             entity.setPath(parent.getPath() + "-" + RandomUtil.randomChar(4));
         }
         }
     }
     }

+ 2 - 2
hsweb-system/hsweb-system-authorization/hsweb-system-authorization-starter/src/main/resources/hsweb-starter.js

@@ -104,7 +104,7 @@ function install(context) {
         .addColumn().name("menu_id").varchar(32).notNull().comment("菜单ID").commit()
         .addColumn().name("menu_id").varchar(32).notNull().comment("菜单ID").commit()
         .addColumn().name("setting_id").varchar(64).notNull().comment("设置ID").commit()
         .addColumn().name("setting_id").varchar(64).notNull().comment("设置ID").commit()
         .addColumn().name("path").varchar(2048).notNull().comment("树编码").commit()
         .addColumn().name("path").varchar(2048).notNull().comment("树编码").commit()
-        .addColumn().name("sort_index").number(32).notNull().comment("树编码").commit()
+        .addColumn().name("sort_index").number(32).comment("树编码").commit()
         .addColumn().name("status").number(4, 0).comment("状态").commit()
         .addColumn().name("status").number(4, 0).comment("状态").commit()
         .addColumn().name("level").number(32, 0).comment("树深度").commit()
         .addColumn().name("level").number(32, 0).comment("树深度").commit()
         .addColumn().name("config").clob().comment("其他配置").commit()
         .addColumn().name("config").clob().comment("其他配置").commit()
@@ -117,7 +117,7 @@ function install(context) {
         .addColumn().name("parent_id").varchar(32).comment("父级ID").commit()
         .addColumn().name("parent_id").varchar(32).comment("父级ID").commit()
         .addColumn().name("permission_id").varchar(2048).comment("权限ID").commit()
         .addColumn().name("permission_id").varchar(2048).comment("权限ID").commit()
         .addColumn().name("path").varchar(2048).notNull().comment("树编码").commit()
         .addColumn().name("path").varchar(2048).notNull().comment("树编码").commit()
-        .addColumn().name("sort_index").number(32).notNull().comment("树编码").commit()
+        .addColumn().name("sort_index").number(32).comment("树编码").commit()
         .addColumn().name("describe").varchar(128).comment("备注").commit()
         .addColumn().name("describe").varchar(128).comment("备注").commit()
         .addColumn().name("url").varchar(2000).comment("URL").commit()
         .addColumn().name("url").varchar(2000).comment("URL").commit()
         .addColumn().name("icon").varchar(512).comment("图标").commit()
         .addColumn().name("icon").varchar(512).comment("图标").commit()