diff --git a/src/main/java/com/huoran/iasf/mapper/xml/SysColumnMapper.xml b/src/main/java/com/huoran/iasf/mapper/xml/SysColumnMapper.xml
index d6d6252..e26e2ef 100644
--- a/src/main/java/com/huoran/iasf/mapper/xml/SysColumnMapper.xml
+++ b/src/main/java/com/huoran/iasf/mapper/xml/SysColumnMapper.xml
@@ -34,17 +34,26 @@
SELECT
* ,
(SELECT u.username from sys_user u WHERE u.id = s.founder_id) as creteUser,
- (SELECT u.username from sys_user u WHERE u.id = s.editor_id) as editorUser
+ (SELECT u.username from sys_user u WHERE u.id = s.editor_id) as editorUser
FROM
sys_column s
WHERE deleted = 1 and site_id = #{vo.siteId}
and column_name LIKE CONCAT('%',#{vo.columnName},'%')
- ORDER BY
- s.father_id,
- s.sort ASC,
- s.create_time desc
+
+
+ ORDER BY
+ s.father_id,
+ s.sort ASC,
+ s.create_time desc
+
+
+ ORDER BY
+ s.create_time asc
+
+
+
@@ -59,12 +68,11 @@
ORDER BY c.create_time asc
diff --git a/src/main/java/com/huoran/iasf/vo/req/PaginationColumnReqVO.java b/src/main/java/com/huoran/iasf/vo/req/PaginationColumnReqVO.java
index d6144d2..43ed613 100644
--- a/src/main/java/com/huoran/iasf/vo/req/PaginationColumnReqVO.java
+++ b/src/main/java/com/huoran/iasf/vo/req/PaginationColumnReqVO.java
@@ -31,4 +31,7 @@ public class PaginationColumnReqVO extends PageReqVO {
@NotNull(message = "站点id不能为空!")
private Integer siteId;
+ @ApiModelProperty(value = "判断是否为排序接口调用(1为排序接口调用 0我栏目管理列表调用)")
+ private Integer isSort;
+
}