fix

Author: jinchengchenghh

velox/substrait/SubstraitToVeloxPlan.cpp

@@ -1795,14 +1795,14 @@ core::TypedExprPtr SubstraitVeloxPlanConverter::connectWithAnd(
     uint32_t idx = 1;
     while (idx < ifThens.size()) {
       ifThenFilter = connectWithAnd(
-          ifThenFilter,
-          exprConverter_->toVeloxExpr(ifThens[idx], inputType));
+          ifThenFilter, exprConverter_->toVeloxExpr(ifThens[idx], inputType));
       idx += 1;
     }
   }
 
   VELOX_CHECK(
-      scalarFilter != nullptr || orListFilter != nullptr || ifThenFilter != nullptr,
+      scalarFilter != nullptr || orListFilter != nullptr ||
+          ifThenFilter != nullptr,
       "One filter should be valid.");
   if (scalarFilter != nullptr && orListFilter != nullptr) {
     auto filter = connectWithAnd(scalarFilter, orListFilter);
@@ -1815,11 +1815,12 @@ core::TypedExprPtr SubstraitVeloxPlanConverter::connectWithAnd(
       return connectWithAnd(scalarFilter, ifThenFilter);
     }
     return scalarFilter;
-  } else {
-    // orListFilter != null
+  } else if (orListFilter != nullptr) {
     if (ifThenFilter != nullptr) {
-      return connectWithAnd(ifThenFilter, ifThenFilter);
+      return connectWithAnd(orListFilter, ifThenFilter);
     }
+    return orListFilter;
+  } else {
     return ifThenFilter;
   }
 }