From e9b179ca7fcada38574b847a63cc073b9bafccfa Mon Sep 17 00:00:00 2001 From: ValerioC Date: Tue, 4 Oct 2022 13:20:55 +0200 Subject: [PATCH] risolto problema su articoli senza diacod --- .../DialogChooseArtsFromListaArts.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java index 2a30def6..d42fe92a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java @@ -207,7 +207,10 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment { .filter(x -> { String codMart = x.getMtbColr().getMtbAart().getCodMart().toLowerCase(); String descrizioneArt = x.getMtbColr().getMtbAart().getDescrizioneEstesa().toLowerCase(); - String diacod = x.getMtbColr().getMtbAart().getDiacod().toLowerCase(); + String diacod = x.getMtbColr().getMtbAart().getDiacod(); + if (!UtilityString.isNullOrEmpty(diacod)) { + diacod = diacod.toLowerCase(); + } return ((codMart.startsWith(finalNewText) || codMart.endsWith(finalNewText) || @@ -217,10 +220,10 @@ public class DialogChooseArtsFromListaArts extends BaseDialogFragment { descrizioneArt.endsWith(finalNewText) || descrizioneArt.contains(finalNewText) || descrizioneArt.equalsIgnoreCase(finalNewText)) || - (diacod.startsWith(finalNewText) || + (!UtilityString.isNullOrEmpty(diacod) && (diacod.startsWith(finalNewText) || diacod.endsWith(finalNewText) || diacod.contains(finalNewText) || - diacod.equalsIgnoreCase(finalNewText))) && + diacod.equalsIgnoreCase(finalNewText)))) && !x.isHidden(); }) .toList();