diff --git a/doc/db/pigxx.sql b/doc/db/pigxx.sql index c5836037a..8f7a15dae 100644 --- a/doc/db/pigxx.sql +++ b/doc/db/pigxx.sql @@ -63,7 +63,7 @@ DROP TABLE IF EXISTS `sys_dept`; CREATE TABLE `sys_dept` ( `dept_id` int(20) NOT NULL AUTO_INCREMENT, `name` varchar(50) DEFAULT NULL COMMENT '部门名称', - `order_num` int(11) DEFAULT NULL COMMENT '排序', + `sort` int(11) DEFAULT NULL COMMENT '排序', `create_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_time` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', `del_flag` char(1) DEFAULT '0' COMMENT '是否删除 -1:已删除 0:正常', @@ -108,7 +108,7 @@ CREATE TABLE `sys_dict` ( `label` varchar(100) NOT NULL COMMENT '标签名', `type` varchar(100) NOT NULL COMMENT '类型', `description` varchar(100) NOT NULL COMMENT '描述', - `sort` decimal(10,0) NOT NULL COMMENT '排序(升序)', + `sort` int(11) NOT NULL COMMENT '排序(升序)', `create_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', `update_time` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', `remarks` varchar(255) DEFAULT NULL COMMENT '备注信息', diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java index 6deb1d922..23a85b046 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java @@ -56,7 +56,7 @@ public class SysDept extends Model { /** * 排序 */ - private Integer orderNum; + private Integer sort; /** * 创建时间 */ diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java index f470e91f4..c9e04153f 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java @@ -29,7 +29,6 @@ import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; import java.io.Serializable; -import java.math.BigDecimal; import java.time.LocalDateTime; /** @@ -74,7 +73,7 @@ public class SysDict extends Model { /** * 排序(升序) */ - private BigDecimal sort; + private Integer sort; /** * 创建时间 */ diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java index eae28bee7..f0448f528 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java @@ -107,7 +107,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl */ @Override public List selectListTree(EntityWrapper sysDeptEntityWrapper) { - sysDeptEntityWrapper.orderBy("order_num", false); + sysDeptEntityWrapper.orderBy("sort", false); return getDeptTree(this.selectList(sysDeptEntityWrapper)); } diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDeptMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDeptMapper.xml index ecda851c6..ecbb83e12 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDeptMapper.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDeptMapper.xml @@ -25,7 +25,7 @@ - + @@ -33,7 +33,7 @@ - dept_id AS deptId, parent_id AS parentId, name, order_num AS orderNum, create_time AS createTime, update_time AS updateTime, del_flag AS delFlag + dept_id AS deptId, parent_id AS parentId, name, sort, create_time AS createTime, update_time AS updateTime, del_flag AS delFlag