From 2d7ba4666d77ae2e2bcd345998f07a1f16ad74c6 Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Mon, 18 Nov 2019 09:27:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=8B=E9=82=BB=E7=A4=BE?=
 =?UTF-8?q?=E7=BE=A4=E6=B5=8B=E8=AF=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 esua-epdc/epdc-gateway/pom.xml                              | 2 +-
 .../dto/group/result/GroupDetailForMobileEndResultDTO.java  | 5 +++++
 esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml  | 6 +++---
 .../src/main/resources/mapper/group/GroupDao.xml            | 5 +++--
 .../src/main/resources/mapper/group/UserGroupDao.xml        | 4 ++--
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml
index f84a048b6..70d3ca31d 100644
--- a/esua-epdc/epdc-gateway/pom.xml
+++ b/esua-epdc/epdc-gateway/pom.xml
@@ -117,7 +117,7 @@
                 <!--<gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>-->
                 <gateway.routes.epdc-user-server.uri>http://127.0.0.1:9068</gateway.routes.epdc-user-server.uri>
                 <gateway.routes.epdc-demo-server.uri>lb://epdc-demo-server</gateway.routes.epdc-demo-server.uri>
-                <gateway.routes.epdc-group-server.uri>http://127.0.0.1:9064</gateway.routes.epdc-group-server.uri>
+                <gateway.routes.epdc-group-server.uri>http://127.0.0.1:9063</gateway.routes.epdc-group-server.uri>
                 <!--<gateway.routes.epdc-group-server.uri>lb://epdc-group-server</gateway.routes.epdc-group-server.uri>-->
                 <gateway.routes.epdc-websocket-server.uri>lb://epdc-websocket-server</gateway.routes.epdc-websocket-server.uri>
                 <!-- nacos -->
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/result/GroupDetailForMobileEndResultDTO.java b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/result/GroupDetailForMobileEndResultDTO.java
index 8bed92e8e..7e76a18ff 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/result/GroupDetailForMobileEndResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/group/result/GroupDetailForMobileEndResultDTO.java
@@ -30,6 +30,11 @@ public class GroupDetailForMobileEndResultDTO implements Serializable {
      */
     private String groupAvatar;
 
+    /**
+     * 社群介绍
+     */
+    private String groupIntroduction;
+
     /**
      * 群主
      */
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml
index b34bada6e..6c28ba9e7 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml
@@ -108,7 +108,7 @@
             <properties>
                 <spring.profiles.active>dev</spring.profiles.active>
 
-                <server.port>9064</server.port>
+                <server.port>9063</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
@@ -131,7 +131,7 @@
             <properties>
                 <spring.profiles.active>test</spring.profiles.active>
 
-                <server.port>9064</server.port>
+                <server.port>9063</server.port>
 
                 <spring.redis.index>2</spring.redis.index>
                 <spring.redis.host>47.104.224.45</spring.redis.host>
@@ -154,7 +154,7 @@
             <properties>
                 <spring.profiles.active>prod</spring.profiles.active>
 
-                <server.port>9064</server.port>
+                <server.port>9063</server.port>
 
                 <!-- redis配置 -->
                 <spring.redis.index>8</spring.redis.index>
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml
index 8e6021827..a11dc1b88 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/GroupDao.xml
@@ -95,7 +95,7 @@
         WHERE
             gp.DEL_FLAG = '0'
             AND gp.GRID_ID = #{gridId}
-            <![CDATA[ AND gp.STATE >= ]]> 20
+            <![CDATA[ AND gp.STATE <> ]]> 20
         GROUP BY
             gp.ID
         ORDER BY
@@ -127,7 +127,7 @@
         GROUP BY
             gp.ID
         ORDER BY
-            latestTopicTime DESC
+            MAX( tp.CREATED_TIME ) DESC
     </select>
     
     <select id="selectOneOfGroupDetailForMobileEnd" resultType="com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO">
@@ -136,6 +136,7 @@
             gp.GROUP_NAME,
             gp.GROUP_AVATAR,
             gp.GROUP_CATEGORY,
+            gp.GROUP_INTRODUCTION,
             COUNT( ugp.ID ) AS totalNum,
             ugp1.NICKNAME,
             ugp2.LORD_FLAG,
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/UserGroupDao.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/UserGroupDao.xml
index 4b5611d38..6259b8246 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/UserGroupDao.xml
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/UserGroupDao.xml
@@ -43,10 +43,10 @@
         <if test="state == 10">
             CONVERT(NICKNAME USING gbk) ASC,
         </if>
-         ASC CREATED_TIME DESC
+         CREATED_TIME DESC
     </select>
 
-    <select id="selectOneOfLordByGroupId" resultType="com.elink.esua.epdc.dto.group.UserGroupDTO">
+    <select id="selectOneOfLordInfoByGroupId" resultType="com.elink.esua.epdc.dto.group.UserGroupDTO">
         SELECT
             ID,
             GROUP_ID,