rez_core 4.0.166 → 4.0.167

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "4.0.166",
+  "version": "4.0.167",
   "description": "",
   "author": "",
   "private": false,

package/src/module/filter/service/filter.service.ts

@@ -290,23 +290,23 @@ export class FilterService {
 
       if (level_type === 'ORG') {
         baseWhere.push({
-          query: `  ((e.level_type = 'ORG' AND e.level_id = ${loggedInUser.organization_id} AND e.organization_id = ${loggedInUser.organization_id}))`,
+          query: `  ((e.level_type = 'ORG' AND e.level_id = '${loggedInUser.organization_id}' AND e.organization_id = '${loggedInUser.organization_id}'))`,
           params: {},
         });
       } else if (level_type === 'SCH') {
         baseWhere.push({
           query: `
         (
-          (e.level_type = 'SCH' AND e.level_id = ${loggedInUser.level_id} AND e.organization_id = ${loggedInUser.organization_id})
+          (e.level_type = 'SCH' AND e.level_id = '${loggedInUser.level_id}' AND e.organization_id = '${loggedInUser.organization_id}')
           OR 
           (
             e.level_type = 'ORG'
-            AND e.level_id = ${loggedInUser.organization_id}
-            AND e.organization_id = ${loggedInUser.organization_id}
+            AND e.level_id = '${loggedInUser.organization_id}'
+            AND e.organization_id = '${loggedInUser.organization_id}'
             AND e.code NOT IN (
               SELECT sub.code 
               FROM frm_wf_comm_template AS sub 
-              WHERE sub.level_type = 'SCH' AND sub.level_id = ${loggedInUser.level_id}
+              WHERE sub.level_type = 'SCH' AND sub.level_id = '${loggedInUser.level_id}'
             )
           )
         )
@@ -330,7 +330,7 @@ export class FilterService {
       baseWhere.push({
         query:
           'e.organization_id = :organization_id AND e.level_type = :level_type AND e.level_id = :level_id',
-        params: { organization_id, level_type, level_id },
+        params: { organization_id : String(organization_id), level_type, level_id },
       });
     }
 
@@ -346,9 +346,9 @@ export class FilterService {
         query:
           'e.organization_id = :organization_id AND e.level_type = :customLevelType AND e.level_id = :customLevelId AND e.appcode = :customAppCode',
         params: {
-          organization_id,
+          organization_id: String(organization_id),
           customLevelType,
-          customLevelId,
+          customLevelId: String(customLevelId),
           customAppCode,
         },
       });
@@ -764,9 +764,23 @@ export class FilterService {
     attributeMeta: Record<string, any>,
   ) {
     return filters
-      .map((f) => this.buildCondition(f, attributeMeta[f.filter_attribute]))
+      .map((f) => {
+        const clause = this.buildCondition(f, attributeMeta[f.filter_attribute]);
+
+        if (!clause) return null;
+
+        // Force every param to be a string
+        if (clause.params) {
+          Object.keys(clause.params).forEach((k) => {
+            clause.params[k] = String(clause.params[k]);
+          });
+        }
+
+        return clause;
+      })
       .filter(
-        (clause): clause is { query: string; params: any } => clause !== null,
+        (clause): clause is { query: string; params: Record<string, string> } =>
+          clause !== null,
       );
   }