npm - rez_core - Versions diffs - 4.0.46 → 4.0.48 - Mend

rez_core 4.0.46 → 4.0.48

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/package.json CHANGED Viewed

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

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

@@ -269,22 +269,25 @@ if (entity_type === 'TEMP' || entity_type === 'TEM') {
     baseWhere.push({
       query: `
         (
-          (e.level_type = 'SCH' AND e.level_id = :sch_level_id)
+          (e.level_type = 'SCH' AND e.level_id = :sch_level_id_sch AND e.organization_id = :org_level_id_sch)
           OR
           (
             e.level_type = 'ORG'
-            AND e.level_id = :org_level_id
+            AND e.level_id = :org_level_id_org
+            AND e.organization_id = :org_level_id_org
             AND e.code NOT IN (
               SELECT sub.code
-              FROM ${templateTable} AS sub
-              WHERE sub.level_type = 'SCH' AND sub.level_id = :sch_level_id
+              FROM frm_wf_comm_template AS sub
+              WHERE sub.level_type = 'SCH' AND sub.level_id = :sch_level_id_sub
             )
           )
         )
       `,
       params: {
-        sch_level_id: loggedInUser.level_id,
-        org_level_id: loggedInUser.organization_id,
+        sch_level_id_sch: loggedInUser.level_id,   // SCH main
+        org_level_id_sch: loggedInUser.organization_id, // SCH main
+        org_level_id_org: loggedInUser.organization_id, // ORG
+        sch_level_id_sub: loggedInUser.level_id    // SCH subquery
       }
     });
   }