rez_core 4.0.38 → 4.0.39

package/package.json

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

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

@@ -261,33 +261,37 @@ export class FilterService {
 
     // check level_id and level_type
 // ✅ Special condition for TEMPLATE entity
-if (entity_type === 'TEM') {
+// ✅ Special condition for TEMPLATE entity
+if (entity_type === 'TEMP' || entity_type === 'TEM') {
+  const templateTable = entityMeta?.data_source || 'frm_comm_template'; // fallback
+
   if (level_type === 'ORG') {
-    // ORG level → no extra filter
+    // ORG level → no filter
   } else if (level_type === 'SCH') {
     baseWhere.push({
       query: `
         (
-          (e.level_type = 'SCH' AND e.level_id = :school_id)
+          (e.level_type = 'SCH' AND e.level_id = :sch_level_id)
           OR 
           (
-            e.level_type = 'ORG' 
-            AND e.level_id = :org_id 
+            e.level_type = 'ORG'
+            AND e.level_id = :org_level_id
             AND e.template_code NOT IN (
-              SELECT template_code 
-              FROM frm_wf_comm_template 
-              WHERE level_type = 'SCH' AND level_id = :school_id
+              SELECT sub.template_code 
+              FROM ${templateTable} AS sub 
+              WHERE sub.level_type = 'SCH' AND sub.level_id = :sch_level_id
             )
           )
         )
       `,
       params: {
-        school_id: level_id,
-        org_id: organization_id,
+        sch_level_id: level_id,
+        org_level_id: organization_id,
       },
     });
   }
-} 
+}
+
 
 if (
   entity_type != 'ORGP' &&