diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java index 49b71f4..0c77df9 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectexception/service/impl/ProjectExceptionServiceImpl.java @@ -161,10 +161,10 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl sectionList) { - log.info("异常处理发起事务 xid:" + RootContext.getXID()); + log.info("异常处理再次发起项目事务 xid:{},异常处理信息:{}",RootContext.getXID(),JsonUtils.objectToJson(projectException)); //查询项目信息 ProjectRecord projectRecord = projectRecordService.getById(projectException.getProjectId()); @@ -326,13 +326,16 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl supplierList = sectionSupplierMap.get(section.getId()); if (null != supplierList && supplierList.size() > 0) { for (SectionSupplier supplier : supplierList) { supplier.setSectionId(section.getId()); supplier.setProjectId(projectRecord.getId()); + supplier.setCreateDate(null); + supplier.setUpdateDate(null); } sectionSupplierAddList.addAll(supplierList); } @@ -343,11 +346,15 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl response = ebtpMallBidApi.entrustInsert(JsonUtils.jsonToList(sectionSupplierList, SectionSupplierVO.class)); + ProjectExceptionEnum.FRAME_EXCEPTION_PROJECT_SECTION_INIT_SUPPLIER_ERROR.customValidName(response.getMessage(),!response.isSuccess()); } } @@ -436,6 +444,7 @@ public class ProjectExceptionServiceImpl extends BaseServiceImpl sectionMaps = projectSectionService.getFlowList(projectId); projectRecordService.initialize(projectId,isReviewMethod,sectionMaps); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java index 055e9a6..ee1635e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectsection/service/impl/ProjectSectionServiceImpl.java @@ -151,7 +151,12 @@ public class ProjectSectionServiceImpl extends BaseServiceImpl selectBatchIds(List sectionIds) { - return projectSectionMapper.selectBatchIds(sectionIds); + sectionIds = sectionIds.stream().filter(n -> StringUtils.isNotBlank(n)).collect(Collectors.toList()); + List projectSectionList = null; + if(null != sectionIds && sectionIds.size() > 0 ){ + projectSectionList = projectSectionMapper.selectBatchIds(sectionIds); + } + return projectSectionList; } @Override