From 86516e793b428b638f72d0ec270c3f040cf844d6 Mon Sep 17 00:00:00 2001
From: "rong.liu" <maureen_liur@163.com>
Date: Fri, 2 Sep 2022 17:03:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=88=86=E6=A0=8F=E7=9B=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E4=BB=A5=E5=8F=8A=E6=8E=92=E5=BA=8F=E6=A0=8F=E7=9B=AE?=
 =?UTF-8?q?=E6=A0=91=E7=BB=93=E6=9E=84=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iasf/mapper/xml/SysColumnMapper.xml       | 33 ++++++++++++-------
 .../iasf/vo/req/PaginationColumnReqVO.java    |  3 ++
 2 files changed, 24 insertions(+), 12 deletions(-)

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}
         <if test="vo.columnName != '' and vo.columnName!= null">
             and column_name LIKE CONCAT('%',#{vo.columnName},'%')
         </if>
-        ORDER BY
-        s.father_id,
-        s.sort ASC,
-        s.create_time desc
+
+        <if test="vo.isSort== 1">
+            ORDER BY
+            s.father_id,
+            s.sort ASC,
+            s.create_time desc
+        </if>
+        <if test="vo.isSort== 0">
+            ORDER BY
+            s.create_time asc
+        </if>
+
+
     </select>
 
 
@@ -59,12 +68,11 @@
         ORDER BY c.create_time asc
     </select>
     <select id="getParentInformationBasedOnChild" resultType="com.huoran.iasf.vo.FatherContentRespVO">
-        SELECT
-            T2.id,
-            T2.column_name ,
-            T2.father_id,
-            T2.level,
-            T2.sort
+        SELECT T2.id,
+               T2.column_name,
+               T2.father_id,
+               T2.level,
+               T2.sort
         FROM (
                  SELECT @r AS _id,
 	( SELECT @r := father_id FROM sys_column WHERE id = _id ) AS parent_id,
@@ -77,7 +85,8 @@
              ) T1
                  JOIN sys_column T2 ON T1._id = T2.id
         WHERE
-            deleted = 1 and id != #{id}
+            deleted = 1
+          and id != #{id}
         ORDER BY
             T1.lvl DESC
     </select>
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;
+
 }