From a30f68b5dd8dde0d9f6130f3a9874b4d78396698 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 26 Mar 2021 15:59:47 +0800 Subject: [PATCH] =?UTF-8?q?subProcess=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/ProjectTraceServiceImpl.java | 2 +- .../src/main/resources/mapper/ProjectSubProcessDao.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java index e86057c3d6..d3b4e1d55f 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java @@ -149,9 +149,9 @@ public class ProjectTraceServiceImpl implements ProjectTraceService { // 是否发送到外部系统 0否 1是 if (!CollectionUtils.isEmpty(subProcess)){ processList.forEach(p -> { + List process = new ArrayList<>(); subProcess.forEach(s -> { if (p.getProcessId().equals(s.getProcessId())){ - List process = new ArrayList<>(); process.add(s); p.setSubProcess(process); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml index 3e98453d09..ef4ca830ed 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectSubProcessDao.xml @@ -60,8 +60,8 @@ psp.PLATFORM_NAME as platformName, psp.EXTERNAL_STATUS as externalStatus, psp.CREATED_TIME AS processTime, - psp.HANDLE_USER_NAME as handleUserName, - psp.RESULT as result, + IFNULL(psp.HANDLE_USER_NAME,'') as handleUserName, + IFNULL(psp.RESULT,'') as result, psp.process_id as processId FROM project_sub_process psp WHERE psp.DEL_FLAG = 0