|
@@ -67,7 +67,7 @@ public class BomProcedureServiceImpl extends SuperServiceImpl<BomProcedureMapper
|
|
|
|
|
|
Map<Long, List<BomProcedureTrayGroup>> bomProcedureTrayGroupMap = new HashMap<Long, List<BomProcedureTrayGroup>>();
|
|
|
if(procedureTrayGroupList!=null&&procedureTrayGroupList.size()>0){
|
|
|
- bomProcedureTrayGroupMap = procedureTrayGroupList.stream().collect(Collectors.groupingBy(BomProcedureTrayGroup::getProcedureId));
|
|
|
+ bomProcedureTrayGroupMap = procedureTrayGroupList.stream().filter(t->t.getProcedureId()!=null).collect(Collectors.groupingBy(BomProcedureTrayGroup::getProcedureId));
|
|
|
}
|
|
|
|
|
|
Map<Long, List<BomProcedureProgram>> programMap = new HashMap<Long, List<BomProcedureProgram>>();
|