subProcess修改

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<SubProcessDTO> process = new ArrayList<>();
 				subProcess.forEach(s -> {
 					if (p.getProcessId().equals(s.getProcessId())){
-						List<SubProcessDTO> process = new ArrayList<>();
 						process.add(s);
 						p.setSubProcess(process);
 					}

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