diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java index 14517eee..5fd7ab76 100644 --- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java +++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java @@ -1185,7 +1185,12 @@ public class BomNewEbomParentService extends ServiceImpl rowIds = dto.getRowIdList(); - List bomNewEbomParentEntityList = this.lambdaQuery().in(BomNewEbomParentEntity::getRowId, rowIds).eq(BomNewEbomParentEntity::getRootIs, 1).list(); + List bomNewEbomParentEntityList = this.lambdaQuery() + .in(BomNewEbomParentEntity::getRowId, rowIds) + .and(wrapper -> wrapper.eq(BomNewEbomParentEntity::getRootIs, 1) + .or(w -> w.eq(BomNewEbomParentEntity::getCreatedBy, SessionUtil.getUserCode()) + .and(w1 -> w1.eq(BomNewEbomParentEntity::getUserRootIs, 1)))) + .list(); if (CollUtil.isEmpty(bomNewEbomParentEntityList)) { // return ResultVO.error("下级BOM无法进行复核");