rez_core 2.2.120 → 2.2.122

package/package.json

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

package/src/module/workflow/service/populate-workflow.service.ts

@@ -149,10 +149,19 @@ export class PopulateWorkflowService extends EntityServiceImpl {
     );
     const [workflows, stageGroups, stages] = factoryData;
 
-    const status_name = await this.dataSource.query(
-      `SELECT * FROM cr_list_master_items WHERE code='STATUS_ACTIVE' AND organization_id = 1`,
+    let statusRow = await this.dataSource.query(
+      `SELECT * FROM cr_list_master_items WHERE code='STATUS_ACTIVE' AND organization_id = ?`,
+      [organization_id],
     );
 
+    if (statusRow.length === 0) {
+      statusRow = await this.dataSource.query(
+        `SELECT * FROM cr_list_master_items WHERE code='STATUS_ACTIVE' AND organization_id = -1`,
+      );
+    }
+
+    const statusValue = statusRow[0]?.id;
+
     // === 1. Workflow mapping
     const workflowIdMap: Record<number, number> = {};
     for (const row of workflows) {
@@ -163,7 +172,7 @@ export class PopulateWorkflowService extends EntityServiceImpl {
           organization_id,
           level_id: organization_id,
           entity_type: 'WRFW',
-          status: status_name[0].name,
+          status: statusValue,
         },
         loggedInUser,
       );
@@ -190,7 +199,7 @@ export class PopulateWorkflowService extends EntityServiceImpl {
           organization_id,
           level_id: organization_id,
           entity_type: 'STGP',
-          status: status_name[0].name,
+          status: statusValue,
         },
         loggedInUser,
       );
@@ -213,7 +222,7 @@ export class PopulateWorkflowService extends EntityServiceImpl {
           organization_id,
           level_id: organization_id,
           entity_type: 'STG',
-          status: status_name[0].name,
+          status: statusValue,
         },
         loggedInUser,
       );
@@ -301,7 +310,7 @@ export class PopulateWorkflowService extends EntityServiceImpl {
             level_id: organization_id,
             entity_type: 'ACTN',
             form: formActionCategory.length > 0 ? formViewMaster[0]?.id : null,
-            status: status_name[0].name,
+            status: statusValue,
           },
           loggedInUser,
         );