Merge branch 'dev_0814' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_0814

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;
 }

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);
     }
 

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.ISSUE_CONTENT AS issueContent,
-            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>

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>