diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java index 9bd569db..6f1026b8 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/OptionalMbomMaterialService.java @@ -244,13 +244,13 @@ public class OptionalMbomMaterialService extends ServiceImpl entityList2=entityList.stream().filter(item -> (Objects.nonNull(item.getRowId()) && item.getRowId() > 0)).collect(Collectors.toList()); - - - entityList2.forEach(item->{ + entityList.forEach(item->{ item.setParentRowId(dto.getRowId()); item.setRootRowId(parentRow.getRootRowId()); - item.setCreatedTime(DateUtil.now()); + if(Objects.isNull(item.getRowId()) || item.getRowId().longValue() == 0){ + item.setCreatedTime(DateUtil.now()); + } + item.setCreatedBy(SessionUtil.getUserCode()); item .setRealName(SessionUtil.getRealName()); item .setDeptName(SessionUtil.getDepartName());