diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/FiltroOrdineDTO.java b/app/src/main/java/it/integry/integrywmsnative/core/model/FiltroOrdineDTO.java
index 51324c14..059eeb96 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/model/FiltroOrdineDTO.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/FiltroOrdineDTO.java
@@ -83,14 +83,17 @@ public class FiltroOrdineDTO {
         FiltroOrdineDTO that = (FiltroOrdineDTO) o;
 
         if (getNumOrd() != that.getNumOrd()) return false;
-        if (!getGestioneOrd().equals(that.getGestioneOrd())) return false;
-        return dataOrd.equals(that.dataOrd);
+        if (getGestioneOrd() != null ? !getGestioneOrd().equals(that.getGestioneOrd()) : that.getGestioneOrd() != null)
+            return false;
+        if (dataOrd != null ? !dataOrd.equals(that.dataOrd) : that.dataOrd != null) return false;
+        return dataCons != null ? dataCons.equals(that.dataCons) : that.dataCons == null;
     }
 
     @Override
     public int hashCode() {
-        int result = getGestioneOrd().hashCode();
-        result = 31 * result + dataOrd.hashCode();
+        int result = getGestioneOrd() != null ? getGestioneOrd().hashCode() : 0;
+        result = 31 * result + (dataOrd != null ? dataOrd.hashCode() : 0);
+        result = 31 * result + (dataCons != null ? dataCons.hashCode() : 0);
         result = 31 * result + getNumOrd();
         return result;
     }