rez_core 2.2.28 → 2.2.29

package/package.json

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

package/src/module/user/service/user.service.ts

@@ -73,7 +73,8 @@ export class UserService extends EntityServiceImpl {
         loggedInUser?.organization_id || 0,
       );
 
-    userData.name = (userData.first_name || '') + (userData.last_name || '');
+    userData.name =
+      (userData.first_name || '') + ' ' + (userData.last_name || '');
     userData.password = EncryptUtilService.encryptGCM(
       userData.password || 'Admin@123',
       this.masterKey,

package/src/module/workflow/repository/form-master.repository.ts

@@ -21,8 +21,8 @@ export class FormMasterRepository {
       .createQueryBuilder()
       .select(['fm.id', 'fm.form_name'])
       .from('cr_form_master', 'fm')
-      .where('fm.organization_id = :orgId', { orgId: organization_id })
-      .andWhere('fm.source_entity_type = :sourceEntityType', {
+      // .where('fm.organization_id = :orgId', { orgId: organization_id })
+      .where('fm.source_entity_type = :sourceEntityType', {
         sourceEntityType: source_entity_type,
       })
       .getRawMany();

package/src/module/workflow/service/action-category.service.ts

@@ -12,14 +12,14 @@ export class ActionCategoryService extends EntityServiceImpl {
   async getActionsCat(loggedInUser: UserData, entity_type: string) {
     const { organization_id } = loggedInUser;
 
+    console.log(entity_type, 'entity_type in action category service');
+
     const result = await this.dataSource.query(
       `
     SELECT id, name 
     FROM cr_wf_action_category 
-    WHERE mapped_entity_type = ? 
-      AND organization_id = ?
-    `,
-      [entity_type, organization_id],
+    WHERE mapped_entity_type = ?`,
+      [entity_type],
     );
 
     return result.map((row: any) => ({
@@ -50,9 +50,9 @@ export class ActionCategoryService extends EntityServiceImpl {
       `
       SELECT *
       FROM cr_wf_action_category
-      WHERE organization_id = ? AND id = ?
+      WHERE id = ?
       `,
-      [organization_id, action_cat_id],
+      [action_cat_id],
     );
 
     return result;