rakor
/
nflg_project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/DM/nflg-bom' into feature/DM/nflg-bom 

# Conflicts:
#	nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
This commit is contained in:
曹鹏飞 2024-03-28 16:08:25 +08:00
parent b793bf01c4 7c5c9abc40
commit 647e375b6b
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java
View File

@ -1185,12 +1185,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
List<Long> rowIds = dto.getRowIdList();
List<BomNewEbomParentEntity> 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();
List<BomNewEbomParentEntity> bomNewEbomParentEntityList = this.lambdaQuery().in(BomNewEbomParentEntity::getUserRootIs, rowIds).eq(BomNewEbomParentEntity::getUserRootIs, 1).list();
if (CollUtil.isEmpty(bomNewEbomParentEntityList)) {
// return ResultVO.error("下级BOM无法进行复核");