rez_core 2.1.43 → 2.1.44
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/dist/module/listmaster/service/list-master.service.js +7 -1
- package/dist/module/listmaster/service/list-master.service.js.map +1 -1
- package/dist/module/module/controller/module-access.controller.js +7 -1
- package/dist/module/module/controller/module-access.controller.js.map +1 -1
- package/dist/module/module/service/module-access.service.d.ts +2 -1
- package/dist/module/module/service/module-access.service.js +10 -3
- package/dist/module/module/service/module-access.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/listmaster/service/list-master.service.ts +7 -1
- package/src/module/module/controller/module-access.controller.ts +21 -14
- package/src/module/module/service/module-access.service.ts +33 -31
|
@@ -55,9 +55,15 @@ let ListMasterService = class ListMasterService {
|
|
|
55
55
|
}
|
|
56
56
|
if (loggedInUser?.level_type && loggedInUser?.level_id) {
|
|
57
57
|
if (!this.skipLevelFilterEntities.includes(sourceList)) {
|
|
58
|
-
qb.andWhere(`${tableName}.level_type = :levelType AND ${tableName}.level_id = :levelId`, {
|
|
58
|
+
qb.andWhere(`${tableName}.level_type = :levelType AND ${tableName}.level_id = :levelId AND ${tableName}.organization_id = :organization_id`, {
|
|
59
59
|
levelType: loggedInUser.level_type,
|
|
60
60
|
levelId: loggedInUser.level_id,
|
|
61
|
+
organization_id: loggedInUser.organization_id,
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
qb.andWhere(`${tableName}.organization_id = :organization_id`, {
|
|
66
|
+
organization_id: loggedInUser.organization_id,
|
|
61
67
|
});
|
|
62
68
|
}
|
|
63
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-master.service.js","sourceRoot":"","sources":["../../../../src/module/listmaster/service/list-master.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2CAIwB;AACxB,6FAAuF;AACvF,iFAA4E;AAC5E,gGAA2F;AAC3F,+BAAsC;AACtC,yCAA4C;AAC5C,qCAAwC;AACxC,oFAAoF;AAK7E,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAC5B,YACmB,aAA4B,EAC5B,mBAAwC,EACxC,cAAoC,EACpC,aAAwC,EACxC,kBAAsC,EACtC,WAAwB;QALxB,kBAAa,GAAb,aAAa,CAAe;QAC5B,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,mBAAc,GAAd,cAAc,CAAsB;QACpC,kBAAa,GAAb,aAAa,CAA2B;QACxC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,gBAAW,GAAX,WAAW,CAAa;QAG1B,4BAAuB,GAAG,CAAC,KAAK,CAAC,CAAC;IAFhD,CAAC;IAIJ,KAAK,CAAC,kBAAkB,CACtB,IAAY,EACZ,MAA8B,EAC9B,gBAA2B,EAC3B,YAAuB;QAEvB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QAE1D,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,0BAAiB,CAAC,QAAQ,IAAI,YAAY,CAAC,CAAC;QAEnE,QAAQ,MAAM,CAAC,MAAM,EAAE,CAAC;YACtB,KAAK,QAAQ;gBACX,OAAO,IAAI,CAAC,eAAe,CACzB,IAAI,EACJ,MAAM,EACN,gBAAgB,EAChB,YAAY,CACb,CAAC;YAEJ,KAAK,QAAQ;gBACX,OAAO,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YAElD,KAAK,QAAQ;gBACX,OAAO,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;YAEvE;gBACE,MAAM,IAAI,4BAAmB,CAAC,mBAAmB,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;QACtE,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,eAAe,CAC3B,UAAkB,EAClB,MAA2B,EAC3B,gBAA2B,EAC3B,YAAuB;QAEvB,IAAI,MAAM,GAAuC,EAAE,CAAC;QACpD,IAAI,CAAC,UAAU;YAAE,OAAO,MAAM,CAAC;QAE/B,MAAM,YAAY,GAChB,MAAM,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAC3D,MAAM,SAAS,GAAG,YAAY,CAAC,aAAa,CAAC;QAE7C,MAAM,kBAAkB,GAAG,CACzB,EAAO,EACP,SAA0B,QAAQ,EAClC,EAAE;YACF,IAAI,MAAM,EAAE,CAAC;gBACX,EAAE,CAAC,KAAK,CAAC,GAAG,SAAS,mBAAmB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;YACxD,CAAC;YAED,IAAI,YAAY,EAAE,UAAU,IAAI,YAAY,EAAE,QAAQ,EAAE,CAAC;gBAEvD,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;oBACvD,EAAE,CAAC,QAAQ,CACT,GAAG,SAAS,gCAAgC,SAAS,
|
|
1
|
+
{"version":3,"file":"list-master.service.js","sourceRoot":"","sources":["../../../../src/module/listmaster/service/list-master.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,13 @@ let ModuleAccessController = class ModuleAccessController {
|
|
|
25
25
|
async getRoles(appcode, req) {
|
|
26
26
|
let level_type = req.user.userData.level_type;
|
|
27
27
|
let level_id = req.user.userData.level_id;
|
|
28
|
-
|
|
28
|
+
let organization_id = req.user.userData.organization_id;
|
|
29
|
+
return this.moduleAccessService.getRoles({
|
|
30
|
+
appcode,
|
|
31
|
+
level_type,
|
|
32
|
+
level_id,
|
|
33
|
+
organization_id,
|
|
34
|
+
});
|
|
29
35
|
}
|
|
30
36
|
async getModules(appcode, req) {
|
|
31
37
|
return this.moduleAccessService.getModules({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-access.controller.js","sourceRoot":"","sources":["../../../../src/module/module/controller/module-access.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAYwB;AACxB,4EAAuE;AACvE,2DAAgE;AAChE,0DAAsD;AAI/C,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IACjC,YACmB,mBAAwC,EACxC,WAAwB;QADxB,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,gBAAW,GAAX,WAAW,CAAa;IACxC,CAAC;IAGE,AAAN,KAAK,CAAC,QAAQ,CAAmB,OAAe,EAAa,GAAG;QAC9D,IAAI,UAAU,
|
|
1
|
+
{"version":3,"file":"module-access.controller.js","sourceRoot":"","sources":["../../../../src/module/module/controller/module-access.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,10 +13,11 @@ export declare class ModuleAccessService {
|
|
|
13
13
|
value: number;
|
|
14
14
|
group: string;
|
|
15
15
|
}[]>;
|
|
16
|
-
getRoles({ appcode, level_type, level_id, }: {
|
|
16
|
+
getRoles({ appcode, level_type, level_id, organization_id, }: {
|
|
17
17
|
appcode: string;
|
|
18
18
|
level_type?: string;
|
|
19
19
|
level_id?: number;
|
|
20
|
+
organization_id?: number;
|
|
20
21
|
}): Promise<{
|
|
21
22
|
label: any;
|
|
22
23
|
value: any;
|
|
@@ -25,7 +25,7 @@ let ModuleAccessService = class ModuleAccessService {
|
|
|
25
25
|
appcode,
|
|
26
26
|
});
|
|
27
27
|
}
|
|
28
|
-
async getRoles({ appcode, level_type, level_id, }) {
|
|
28
|
+
async getRoles({ appcode, level_type, level_id, organization_id, }) {
|
|
29
29
|
const query = this.dataSource
|
|
30
30
|
.createQueryBuilder()
|
|
31
31
|
.select('*')
|
|
@@ -35,8 +35,15 @@ let ModuleAccessService = class ModuleAccessService {
|
|
|
35
35
|
if (level_type) {
|
|
36
36
|
query.andWhere('role.level_type = :level_type', { level_type });
|
|
37
37
|
}
|
|
38
|
+
if (organization_id) {
|
|
39
|
+
query.andWhere('role.organization_id = :organization_id', {
|
|
40
|
+
organization_id,
|
|
41
|
+
});
|
|
42
|
+
}
|
|
38
43
|
if (level_id !== undefined) {
|
|
39
|
-
query.andWhere('role.level_id = :level_id', {
|
|
44
|
+
query.andWhere('role.level_id = :level_id', {
|
|
45
|
+
level_id: String(level_id),
|
|
46
|
+
});
|
|
40
47
|
}
|
|
41
48
|
const roles = await query.getRawMany();
|
|
42
49
|
return roles.map((role) => ({
|
|
@@ -78,7 +85,7 @@ let ModuleAccessService = class ModuleAccessService {
|
|
|
78
85
|
if (level_type === 'SCH') {
|
|
79
86
|
const result = await this.dataSource.query(`SELECT * FROM cr_school WHERE id = ${level_id}`, [level_id]);
|
|
80
87
|
const school = result?.[0];
|
|
81
|
-
if (!school || school.status ===
|
|
88
|
+
if (!school || school.status === 'INACTIVE') {
|
|
82
89
|
return allPermissions.filter((perm) => perm.action === 'VIEW');
|
|
83
90
|
}
|
|
84
91
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-access.service.js","sourceRoot":"","sources":["../../../../src/module/module/service/module-access.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAyE;AACzE,qFAAgF;AAKhF,qCAAoD;AAEpD,mEAA+D;AAGxD,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC9B,YACmB,sBAA8C,EAC9C,cAA8B,EAC9B,UAAsB;QAFtB,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,mBAAc,GAAd,cAAc,CAAgB;QAC9B,eAAU,GAAV,UAAU,CAAY;IACtC,CAAC;
|
|
1
|
+
{"version":3,"file":"module-access.service.js","sourceRoot":"","sources":["../../../../src/module/module/service/module-access.service.ts"],"names":[],"mappings":"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"}
|