From bd6858af99eb0d7db9884b12abe9d739d55063f2 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 28 Aug 2024 16:45:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5=E6=94=B9=E4=B8=BAdouble?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/prod/2024-3-18-变更.sql | 4 ++++ .../com/jero/modules/laws/common/util/TreeNodeComparator.java | 2 +- .../modules/laws/dataCenter/entity/LawsDataCenterFolder.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/db/prod/2024-3-18-变更.sql b/db/prod/2024-3-18-变更.sql index 1588bb90..ff381ed9 100644 --- a/db/prod/2024-3-18-变更.sql +++ b/db/prod/2024-3-18-变更.sql @@ -216,3 +216,7 @@ INSERT INTO sys_sms_template (id, template_code, template_name, template_content -- 2024-08-23 岗位 ALTER TABLE laws_working_group_user ADD COLUMN `job` varchar(500) NULL COMMENT '岗位' AFTER `del_flag`; + +-- 2024-08-23 资料中心排序字段改为double +ALTER TABLE `laws_data_center_folder` + MODIFY COLUMN `sort` double NULL DEFAULT NULL COMMENT '文件夹顺序' AFTER `auth_view_ids`; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/util/TreeNodeComparator.java b/laws-modules/src/main/java/com/jero/modules/laws/common/util/TreeNodeComparator.java index f2b0cd51..5e5d3cb7 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/util/TreeNodeComparator.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/util/TreeNodeComparator.java @@ -13,6 +13,6 @@ public class TreeNodeComparator implements Comparator { @Override public int compare(LawsDataCenterFolder o1, LawsDataCenterFolder o2) { // 升序排序 - return Integer.compare(o1.getSort(), o2.getSort()); + return Double.compare(o1.getSort(), o2.getSort()); } } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/entity/LawsDataCenterFolder.java b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/entity/LawsDataCenterFolder.java index ea3a10d0..7cf35930 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/entity/LawsDataCenterFolder.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/entity/LawsDataCenterFolder.java @@ -122,7 +122,7 @@ public class LawsDataCenterFolder implements Serializable { @NotNull(message = "文件夹顺序不能为空") @Max(value = 999999999, message = "文件夹顺序超出最大限度") @Min(value = 0, message = "文件夹顺序不能小于0") - private java.lang.Integer sort; + private java.lang.Double sort; /** * 父id */