From 970757119c1e21b4bd025a4d095c6045b1d0ee63 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 23 Oct 2020 14:47:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/screen/ScreenDifficultyDataDao.xml      | 14 ++++++++++++--
 .../epmet/controller/ProjectTraceController.java   |  1 -
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
index dfdc3c2f26..2c7d900a41 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenDifficultyDataDao.xml
@@ -30,13 +30,23 @@
          DESC
     </select>
 
+    <resultMap id="projectDetail" type="com.epmet.project.dto.result.ProjectDetailResultDTO">
+        <result property="eventContent" column="eventContent"/>
+        <result property="eventTitle" column="eventTitle"/>
+        <result property="eventSource" column="eventSource"/>
+        <collection property="imgUrlList" ofType="java.lang.String">
+            <constructor>
+                <arg column="imgUrl"/>
+            </constructor>
+        </collection>
+    </resultMap>
     <!-- 项目详情 -->
-    <select id="projectDetail" resultType="com.epmet.project.dto.result.ProjectDetailResultDTO">
+    <select id="projectDetail" resultMap="projectDetail">
         SELECT
             dd.event_title AS eventTitle,
             dd.EVENT_CONTENT AS eventContent,
             dd.EVENT_SOURCE AS eventSource,
-            GROUP_CONCAT( did.EVENT_IMG_URL ) AS imgUrlList
+            did.EVENT_IMG_URL AS imgUrl
         FROM
             screen_difficulty_data dd
             LEFT JOIN screen_difficulty_img_data did ON did.EVENT_ID = dd.EVENT_ID
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java
index 9ca5fdc0db..bbdfa5378b 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectTraceController.java
@@ -186,7 +186,6 @@ public class ProjectTraceController {
 	 * @Description 项目跟踪-项目处理进展列表
 	 **/
 	@PostMapping("processlistnotrule")
-	@RequirePermission(requirePermission = RequirePermissionEnum.WORK_PROJECT_TRACE_DETAIL)
 	public Result<List<ProcesslistResultDTO>> processListNotRule(@RequestBody ProcessListFormDTO formDTO) {
 		ValidatorUtils.validateEntity(formDTO);
 		return new Result<List<ProcesslistResultDTO>>().ok(projectProcessService.progressList(formDTO));