rez_core 2.1.67 → 2.1.68

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
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "rez_core",
3
- "version": "2.1.67",
3
+ "version": "2.1.68",
4
4
  "description": "",
5
5
  "author": "",
6
6
  "private": false,
@@ -96,22 +96,31 @@ export class MenuRepository extends Repository<MenuData> {
96
96
  ): Promise<number[]> {
97
97
  const repo = this.dataSource.getRepository(UserRoleMapping);
98
98
 
99
- // if (userId) {
100
- // // Check if user has any role mappings for the given appcode
101
- // const getUserDetails = await this.dataSource.query(
102
- // `
103
- // SELECT * from cr_user where id = ?
104
- // `,
105
- // [userId],
106
- // );
107
-
108
- // if (
109
- // getUserDetails.length > 0 &&
110
- // getUserDetails[0].organization_id === 1
111
- // ) {
112
- // return [6];
113
- // }
114
- // }
99
+ if (userId) {
100
+ // Check if user has any role mappings for the given appcode
101
+ const getUserDetails = await this.dataSource.query(
102
+ `
103
+ SELECT * from cr_user where id = ?
104
+ `,
105
+ [userId],
106
+ );
107
+
108
+ // get user role from urm
109
+
110
+ const getUserUrm = await this.dataSource.query(
111
+ `
112
+ SELECT * from cr_user_role_mapping where user_id = ? and appcode = ?
113
+ `,
114
+ [userId, appcode],
115
+ );
116
+
117
+ if (
118
+ getUserDetails.length > 0 &&
119
+ getUserDetails[0].organization_id === 1
120
+ ) {
121
+ return [Number(getUserUrm[0].role_id)];
122
+ }
123
+ }
115
124
 
116
125
  // 1. Try exact level match
117
126
  let roles = await repo