Merge branch 'master' into develop
This commit is contained in:
@@ -703,12 +703,13 @@ public class SteUPService {
|
||||
|
||||
for (Map.Entry<String, List<HashMap<String, Object>>> entry : pluByCodMarts.entrySet()) {
|
||||
String codMart = entry.getKey();
|
||||
System.out.println(codMart);
|
||||
List<HashMap<String, Object>> hashMapList = entry.getValue();
|
||||
|
||||
boolean containBarcode = hashMapList.stream().anyMatch(x -> finalBarcodes.contains(((String) x.get("barcode"))));
|
||||
|
||||
if (!containBarcode)
|
||||
barcodes.add(hashMapList.stream().findFirst().map(x -> x.get("barcode").toString()).get());
|
||||
barcodes.add(hashMapList.stream().filter(x -> x.get("barcode") !=null).findFirst().map(x -> x.get("barcode").toString()).get());
|
||||
}
|
||||
// barcodes = pluRepo.stream().filter(a-> !finalBarcodes.contains(((String) a.get("barcode")))).map(a->(String) a.get("barcode")).collect(Collectors.toList());
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user