From cf8c803af40b941584aedd479a308e85ef683d19 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Tue, 8 Sep 2020 17:50:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E7=BE=A41+1=20=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?=E9=95=BF=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/dto/PartyGroupOfficialsDTO.java  |  5 +++++
 .../esua/epdc/entity/PartyGroupOfficialsEntity.java  |  5 +++++
 .../main/resources/mapper/PartyGroupOfficialsDao.xml |  7 ++++---
 .../src/main/resources/mapper/PartyTopicDao.xml      | 12 ++++++------
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyGroupOfficialsDTO.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyGroupOfficialsDTO.java
index 6febbc8a..5582e063 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyGroupOfficialsDTO.java
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-client/src/main/java/com/elink/esua/epdc/dto/PartyGroupOfficialsDTO.java
@@ -144,4 +144,9 @@ public class PartyGroupOfficialsDTO implements Serializable {
      */
     private List<Long> allDeptIdsShow;
 
+    /**
+     * 排序
+     */
+    private Integer sort;
+
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyGroupOfficialsEntity.java b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyGroupOfficialsEntity.java
index 70dc848c..25194fb2 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyGroupOfficialsEntity.java
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/java/com/elink/esua/epdc/entity/PartyGroupOfficialsEntity.java
@@ -102,4 +102,9 @@ public class PartyGroupOfficialsEntity extends BaseEpdcEntity {
      */
     private String parentDeptNames;
 
+    /**
+     * 排序
+     */
+    private Integer sort;
+
 }
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupOfficialsDao.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupOfficialsDao.xml
index 45282cfc..9dafc3c3 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupOfficialsDao.xml
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyGroupOfficialsDao.xml
@@ -44,7 +44,8 @@
         t.CREATED_TIME,
         t.UPDATED_BY,
         t.UPDATED_TIME,
-        t1.PARTY_GROUP_NAME
+        t1.PARTY_GROUP_NAME,
+        t.SORT
         from epdc_party_group_officials t
         left join epdc_party_group t1 on t.PARTY_GROUP_ID = t1.ID and t1.DEL_FLAG='0'
         where t.DEL_FLAG ='0'
@@ -61,7 +62,7 @@
             AND (t.GRID_ID = #{gridId}
             OR find_in_set(#{gridId},t.ALL_DEPT_IDS))
         </if>
-        order by  t.CREATED_TIME desc
+        order by t.SORT, t.CREATED_TIME desc
     </select>
 
 
@@ -75,7 +76,7 @@
            AREA_RESPONSIBILITY
         from epdc_party_group_officials
         where DEL_FLAG ='0' and PARTY_GROUP_ID =  #{partyGroupId}
-         order by  CREATED_TIME desc
+         order by SORT, CREATED_TIME desc
          LIMIT #{pageIndex},#{pageSize}
     </select>
 
diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml
index 642b28a6..d3b37926 100644
--- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml
+++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml
@@ -188,7 +188,7 @@
         t5.NICKNAME as supportNickname,
         t5.USER_AVATAR as supportUserAvatar,
         (if(find_in_set(t7.DEPT_ID,t6.ALL_DEPT_IDS)>0,'1','0'))as thisCommunity,
-        t.TOP_FLAG,
+        t.TOP_FLAG
         from epdc_party_topic t
         <if test='userId != "" and userId != null'>
             left join (select * from epdc_party_topic_user_attitude)t1 on t.ID = t1.PARTY_TOPIC_ID and t1.DEL_FLAG='0' and t1.USER_ID = #{userId}
@@ -339,13 +339,13 @@
     </select>
 
     <update id="updateTopicTopFlagById">
-        UPDATE epdc_party_topic SET TOP_FLAG = #{topFlag}
-        <if test="formDto.topFlag != null and formDto.topFlag != '' and formDto.topFlag == '0'">
-            , TOP_TIME = CREATED_TIME
+        UPDATE epdc_party_topic SET TOP_FLAG = #{formDto.topFlag}
+        <if test='formDto.topFlag == "0"'>
+            , TOP_TIME = NULL
         </if>
-        <if test="formDto.topFlag != null and formDto.topFlag != '' and formDto.topFlag == '1'">
+        <if test='formDto.topFlag == "1"'>
             , TOP_TIME = NOW()
         </if>
-        WHERE ID = #{topicId}
+        WHERE ID = #{formDto.topicId}
     </update>
 </mapper>
\ No newline at end of file