diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java index 67729c39..d6177ac7 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java @@ -88,7 +88,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService { projectOrderInfo.setOrderCode(orderNumber); projectOrderInfo.setCreateTime(DateUtils.getNowDate()); projectOrderInfo.setCreateBy(ShiroUtils.getUserId().toString()); - saveProductInfo(projectOrderInfo); + saveProductInfo(projectOrderInfo, projectOrderInfo.getProjectId()); List contractFileList = projectOrderInfo.getContractFileList(); int i = projectOrderInfoMapper.insertProjectOrderInfo(projectOrderInfo); if (CollUtil.isNotEmpty(contractFileList)) { @@ -97,7 +97,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService { return i; } - private void saveProductInfo(ProjectOrderInfo projectOrderInfo) { + private void saveProductInfo(ProjectOrderInfo projectOrderInfo, Long projectId) { //插入产品信息 List projectProductInfoList = projectOrderInfo.getHardwareProjectProductInfoList(); if (CollUtil.isEmpty(projectProductInfoList)) { @@ -107,7 +107,9 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService { projectProductInfoList.addAll(CollUtil.isNotEmpty(projectOrderInfo.getMaintenanceProjectProductInfoList()) ? projectOrderInfo.getMaintenanceProjectProductInfoList() : new ArrayList<>()); if (CollUtil.isNotEmpty(projectProductInfoList)) { for (ProjectProductInfo projectProductInfo : projectProductInfoList) { - projectProductInfo.setProjectId(projectOrderInfo.getId()); + if (projectProductInfo.getProjectId() == null) { + projectProductInfo.setProjectId(projectId); + } } productInfoService.saveBatch(projectProductInfoList); } @@ -160,7 +162,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService { } projectOrderInfo.setUpdateBy(ShiroUtils.getUserId().toString()); projectOrderInfo.setUpdateTime(DateUtils.getNowDate()); - saveProductInfo(projectOrderInfo); + saveProductInfo(projectOrderInfo, projectOrderInfo.getProjectId()); return projectOrderInfoMapper.updateProjectOrderInfo(projectOrderInfo); }