diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/LawsTreeNodeModel.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/LawsTreeNodeModel.java index 5c788852..9f0150c0 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/LawsTreeNodeModel.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/LawsTreeNodeModel.java @@ -1,7 +1,6 @@ package com.jero.modules.laws.enterprise.entity.vo; import com.fasterxml.jackson.annotation.JsonFormat; -import com.jero.common.system.vo.SysDepartTreeModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -76,7 +75,7 @@ public class LawsTreeNodeModel { private java.lang.Integer nodeType; /**排序*/ @ApiModelProperty(value = "排序") - private java.lang.Integer nodeOrder; + private java.lang.Double nodeOrder; private List children = new ArrayList<>(); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsTreeNodeController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsTreeNodeController.java index 5fde4be8..38f6b38b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsTreeNodeController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsTreeNodeController.java @@ -167,4 +167,11 @@ public class LawsTreeNodeController extends JeroController orderFix() { + lawsTreeNodeService.orderFix(); + return Result.OK(); + } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsTreeNode.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsTreeNode.java index 1ef8c08d..9876e8e6 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsTreeNode.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsTreeNode.java @@ -1,23 +1,20 @@ package com.jero.modules.laws.standard.entity; -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.*; -import java.math.BigDecimal; - import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import com.jero.common.aspect.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** @@ -81,7 +78,7 @@ public class LawsTreeNode implements Serializable { private java.lang.Integer nodeType; /**排序*/ @ApiModelProperty(value = "排序") - private java.lang.Integer nodeOrder; + private java.lang.Double nodeOrder; public LawsTreeNode(String id, String parentId, String name) { this.id = id; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsTreeNodeService.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsTreeNodeService.java index 6ed4addf..cb8989b2 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsTreeNodeService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/ILawsTreeNodeService.java @@ -42,4 +42,6 @@ public interface ILawsTreeNodeService extends IService { * @return */ boolean delete(String id, String nodeCode); + + void orderFix(); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java index 04a70b2b..293fb37a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsTreeNodeServiceImpl.java @@ -112,7 +112,7 @@ public class LawsTreeNodeServiceImpl extends ServiceImpl + nodes.sort(Comparator.comparingDouble(node -> node.getNodeOrder() != null ? node.getNodeOrder() : 0)); // 递归对每个节点的子节点进行排序 @@ -246,6 +246,18 @@ public class LawsTreeNodeServiceImpl extends ServiceImpl list = this.list(); + for (LawsTreeNode node : list) { + String nodeCode = node.getNodeCode(); + String order = nodeCode.substring(nodeCode.length() - 1); + node.setNodeOrder(Double.valueOf(order)); + this.updateById(node); + } + } + /** * delete 方法调用 *