rez_core 4.0.40 → 4.0.42
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.
package/package.json
CHANGED
|
@@ -274,8 +274,8 @@ if (entity_type === 'TEMP' || entity_type === 'TEM') {
|
|
|
274
274
|
(
|
|
275
275
|
e.level_type = 'ORG'
|
|
276
276
|
AND e.level_id = ?
|
|
277
|
-
AND e.
|
|
278
|
-
SELECT sub.
|
|
277
|
+
AND e.code NOT IN (
|
|
278
|
+
SELECT sub.code
|
|
279
279
|
FROM ${templateTable} AS sub
|
|
280
280
|
WHERE sub.level_type = 'SCH' AND sub.level_id = ?
|
|
281
281
|
)
|
|
@@ -298,13 +298,14 @@ if (
|
|
|
298
298
|
) {
|
|
299
299
|
baseWhere.push({
|
|
300
300
|
query:
|
|
301
|
-
'e.organization_id =
|
|
302
|
-
params:
|
|
301
|
+
'e.organization_id = :organization_id AND e.level_type = :level_type AND e.level_id = :level_id',
|
|
302
|
+
params: { organization_id, level_type, level_id }, // named params
|
|
303
303
|
});
|
|
304
304
|
}
|
|
305
305
|
|
|
306
306
|
|
|
307
307
|
|
|
308
|
+
|
|
308
309
|
if (entity_type == "USR" || entity_type == "UPR") {
|
|
309
310
|
baseWhere.push({
|
|
310
311
|
query: 'e.is_customer is NULL',
|