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

Merge branch 'feature/DM/nflg-bom' of http://112.74.186.154:3000/nflj/nflg_project into feature/DM/nflg-bom

This commit is contained in:
jing's 2023-12-24 18:17:02 +08:00
parent d9332c5bc6 8c65e78750
commit 9535d8d1df
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -136,7 +136,7 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
resutlData.setPages(1); resutlData.setPages(1);
resutlData.setCurrent(1L); resutlData.setCurrent(1L);
List<BomNewEbomParentVO> all = new ArrayList<>(); List<BomNewEbomParentVO> all = new ArrayList<>();
all.addAll(parents); all.addAll(resultParents);
all.addAll(childs); all.addAll(childs);
List<BomNewEbomParentVO> result = new ArrayList<>(); List<BomNewEbomParentVO> result = new ArrayList<>();
for (BomNewEbomParentVO vo : resultParents) { for (BomNewEbomParentVO vo : resultParents) {