From 3131c3f270c56c9ccb80e651f9406ab4ab438b00 Mon Sep 17 00:00:00 2001
From: Abdul Rahman Reza <rahman77889@gmail.com>
Date: Mon, 2 Dec 2024 13:55:36 +0700
Subject: [PATCH] update common fomr

---
 src/helpers/common.ts | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/helpers/common.ts b/src/helpers/common.ts
index 0db4c65..1a50518 100644
--- a/src/helpers/common.ts
+++ b/src/helpers/common.ts
@@ -144,7 +144,9 @@ export default class CommonHelper {
                         wtp.push(like);
                     }
 
-                    whereAttrPre.push('(' + wtp.join(' or ') + ')');
+                    if (wtp.length > 0) {
+                        whereAttrPre.push('(' + wtp.join(' or ') + ')');
+                    }
 
                     if (param.col_any_eq.length > 0) {
                         whereVal['filter_eq'] = filter_any_val;
@@ -175,7 +177,10 @@ export default class CommonHelper {
                     wtp.push(like);
                 }
 
-                whereAttrPre.push('(' + wtp.join(' or ') + ')');
+                if (wtp.length > 0) {
+                    whereAttrPre.push('(' + wtp.join(' or ') + ')');
+                }
+
 
                 if (param.col_any_eq.length > 0) {
                     whereVal['filter_eq'] = param.filter.toLowerCase();
@@ -186,8 +191,12 @@ export default class CommonHelper {
 
             }
         }
-
-        const whereAttr = whereAttrPre.join(' and ') + (whereAttrPre.length > 0 && param.additional_where != '' ? ' and ' : '') + param.additional_where;
+        let whereAttr = '';
+        if (whereAttrPre.length > 0) {
+            whereAttr = whereAttrPre.join(' and ') + (whereAttrPre.length > 0 && param.additional_where != '' ? ' and ' : '') + param.additional_where;
+        } else {
+            whereAttr += param.additional_where;
+        }
 
 
         return { whereAttr, whereVal };