From c48c008ef3a47270b65aa5b6d4fdc8f5d3bc694a Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Thu, 5 Sep 2019 14:41:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=AD=97=E6=AE=B5f?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/events/EpdcEventsDao.xml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
index 69b013b2b..e18c7a0d1 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
@@ -5,7 +5,7 @@
     <select id="getEventDetailById" resultType="com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO">
         SELECT
             e.ID,
-            e.ISSUE_CONTENT AS issueContent,
+            e.EVENT_CONTENT AS eventContent,
             i.IMG_URL AS images,
             e.NICK_NAME AS nickName,
             e.CREATED_TIME AS createdTime

From b134bd85d42337094bb7e105483121572d719fed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=87=91=E9=B9=8F?= <daofugui@163.com>
Date: Thu, 5 Sep 2019 15:48:21 +0800
Subject: [PATCH 2/2] no message

---
 .../epdc/dto/events/EpdcEventsDetailDTO.java  |  6 +++-
 .../controller/EpdcEventsController.java      |  2 +-
 .../resources/mapper/events/EpdcEventsDao.xml | 32 ++++++++++---------
 .../main/resources/mapper/PartyMembersDao.xml |  1 +
 4 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java
index 9db5f4821..bb9dd80be 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/EpdcEventsDetailDTO.java
@@ -33,5 +33,9 @@ public class EpdcEventsDetailDTO implements Serializable {
     /**
      * 图片
      */
-    private List<String> images;
+    private String images;
+    /**
+     * 图片数据
+     */
+    private String[] imageArray;
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java
index 7145edf79..8bc5e9666 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/controller/EpdcEventsController.java
@@ -61,7 +61,7 @@ public class EpdcEventsController {
     @GetMapping("{id}")
     public Result<EpdcEventsDetailDTO> get(@PathVariable("id") String id){
         EpdcEventsDetailDTO data = epdcEventsService.get(id);
-
+        data.setImageArray(data.getImages().split(","));
         return new Result<EpdcEventsDetailDTO>().ok(data);
     }
 
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
index e18c7a0d1..5981d7ca3 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
@@ -3,20 +3,22 @@
 
 <mapper namespace="com.elink.esua.epdc.modules.events.dao.EpdcEventsDao">
     <select id="getEventDetailById" resultType="com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO">
-        SELECT
-            e.ID,
-            e.EVENT_CONTENT AS eventContent,
-            i.IMG_URL AS images,
-            e.NICK_NAME AS nickName,
-            e.CREATED_TIME AS createdTime
-        FROM
-            epdc_events e
-            LEFT JOIN epdc_img i ON e.ID = i.REFERENCE_ID
-            AND i.DEL_FLAG = '0'
-        WHERE
-            e.DEL_FLAG = '0'
-            AND e.ID = #{id}
-        ORDER BY
-            i.CREATED_TIME
+SELECT
+	e.ID,
+	e.EVENT_CONTENT AS eventContent,
+	GROUP_CONCAT( DISTINCT ( i.IMG_URL ) ) AS images,
+	e.NICK_NAME AS nickName,
+	e.CREATED_TIME AS createdTime
+FROM
+	epdc_events e
+	LEFT JOIN epdc_img i ON e.ID = i.REFERENCE_ID
+	AND i.DEL_FLAG = '0'
+WHERE
+	e.DEL_FLAG = '0'
+	AND e.ID = #{id}
+GROUP BY
+	e.ID
+ORDER BY
+	i.CREATED_TIME
     </select>
 </mapper>
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
index 8ddc60bba..4cf0f16d2 100755
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/PartyMembersDao.xml
@@ -103,6 +103,7 @@
 		and pm.ID = #{id}
 		and pm.DEL_FLAG = '0'
 		and partytag.DEL_FLAG = '0'
+		GROUP BY pm.ID
     </select>