From 312e8fc7780b770e451e93e9dfab7de4a2c68d78 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 8 Jul 2020 10:01:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=91=E8=AD=A6=E8=A1=A8=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5=20sort?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/modules/smile/police/entity/PoliceEntity.java     | 5 +++++
 .../src/main/resources/mapper/smile/police/PoliceDao.xml   | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/police/entity/PoliceEntity.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/police/entity/PoliceEntity.java
index c13691d..eb8a3fc 100644
--- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/police/entity/PoliceEntity.java
+++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/smile/police/entity/PoliceEntity.java
@@ -70,4 +70,9 @@ public class PoliceEntity extends DeptScope {
      */
 	private String displayFlag;
 
+	/**
+	 * 排序
+	 */
+	private Integer sort;
+
 }
\ No newline at end of file
diff --git a/epdc-cloud-property/src/main/resources/mapper/smile/police/PoliceDao.xml b/epdc-cloud-property/src/main/resources/mapper/smile/police/PoliceDao.xml
index a769ac0..3663062 100644
--- a/epdc-cloud-property/src/main/resources/mapper/smile/police/PoliceDao.xml
+++ b/epdc-cloud-property/src/main/resources/mapper/smile/police/PoliceDao.xml
@@ -26,6 +26,7 @@
             OR find_in_set(#{deptId},ep.ALL_DEPT_IDS))
         </if>
         ORDER BY
+        ep.SORT ASC
         ep.CREATED_TIME DESC
     </select>
     <select id="selectPoliceGroupInfo" resultType="com.elink.esua.epdc.smile.dto.police.result.PoliceResultDTO">
@@ -63,7 +64,9 @@
         <if test="parentDeptIds != null and parentDeptIds != ''">
             AND ALL_DEPT_IDS = #{parentDeptIds}
         </if>
-        order by UPDATED_TIME desc
+        ORDER BY
+        SORT ASC
+        UPDATED_TIME DESC
     </select>
     <select id="selectListOfOrganizationInfo" resultType="com.elink.esua.epdc.smile.dto.police.PoliceDTO">
         SELECT
@@ -76,6 +79,8 @@
             epdc_police
         WHERE
             FIND_IN_SET( #{deptId}, ALL_DEPT_IDS )
+        ORDER BY
+        SORT ASC
     </select>
 
     <update id="updateGridByDeptId">