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 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> processListNotRule(@RequestBody ProcessListFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); return new Result>().ok(projectProcessService.progressList(formDTO));