rez_core 2.0.95 → 2.0.96
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/module/controller/module-access.controller.d.ts +1 -0
- package/dist/module/module/repository/module-access.repository.d.ts +1 -0
- package/dist/module/module/repository/module-access.repository.js +9 -4
- package/dist/module/module/repository/module-access.repository.js.map +1 -1
- package/dist/module/module/service/module-access.service.d.ts +1 -0
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/module/repository/module-access.repository.ts +43 -33
|
@@ -60,7 +60,6 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
60
60
|
where: {
|
|
61
61
|
role_code: (0, typeorm_2.In)(roleCodes),
|
|
62
62
|
appcode,
|
|
63
|
-
level_type: levelType,
|
|
64
63
|
},
|
|
65
64
|
});
|
|
66
65
|
return roles.map((role) => ({
|
|
@@ -72,12 +71,15 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
72
71
|
action: access.action_type,
|
|
73
72
|
access: access.access_flag,
|
|
74
73
|
code: access.module_code,
|
|
74
|
+
level_type: access.level_type,
|
|
75
75
|
})),
|
|
76
76
|
}));
|
|
77
77
|
}
|
|
78
78
|
async getAllModulesByLevel(mainModIds, appcode, levelType) {
|
|
79
79
|
const mainModules = mainModIds.length === 1 && mainModIds[0] === '-1'
|
|
80
|
-
? await this.moduleRepo.find({
|
|
80
|
+
? await this.moduleRepo.find({
|
|
81
|
+
where: { module_level: 'MAINMOD', appcode },
|
|
82
|
+
})
|
|
81
83
|
: await this.moduleRepo.find({
|
|
82
84
|
where: { id: (0, typeorm_2.In)(mainModIds), module_level: 'MAINMOD', appcode },
|
|
83
85
|
});
|
|
@@ -86,7 +88,9 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
86
88
|
const wbsCodes = mainModules.map((mod) => mod.wbs_code);
|
|
87
89
|
const allModules = await this.moduleRepo
|
|
88
90
|
.createQueryBuilder('module')
|
|
89
|
-
.where(wbsCodes
|
|
91
|
+
.where(wbsCodes
|
|
92
|
+
.map((code) => `module.wbs_code LIKE :code${code}`)
|
|
93
|
+
.join(' OR '), Object.fromEntries(wbsCodes.map((code) => [`code${code}`, `${code}%`])))
|
|
90
94
|
.andWhere('module.appcode = :appcode', { appcode })
|
|
91
95
|
.getMany();
|
|
92
96
|
const moduleCodes = allModules.map((m) => m.module_code);
|
|
@@ -108,7 +112,8 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
108
112
|
const filteredModules = allModules.filter((m) => m.level_type === lvl);
|
|
109
113
|
const buildHierarchy = (parentWbs) => filteredModules
|
|
110
114
|
.filter((mod) => mod.wbs_code.startsWith(`${parentWbs}.`) &&
|
|
111
|
-
mod.wbs_code.split('.').length ===
|
|
115
|
+
mod.wbs_code.split('.').length ===
|
|
116
|
+
parentWbs.split('.').length + 1)
|
|
112
117
|
.map((mod) => ({
|
|
113
118
|
name: mod.name,
|
|
114
119
|
code: mod.module_code,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-access.repository.js","sourceRoot":"","sources":["../../../../src/module/module/repository/module-access.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAiE;AACjE,6CAAmD;AACnD,qCAAyC;AACzC,+DAA0D;AAC1D,yEAA8D;AAC9D,yEAA8D;AAC9D,2DAAqD;
|
|
1
|
+
{"version":3,"file":"module-access.repository.js","sourceRoot":"","sources":["../../../../src/module/module/repository/module-access.repository.ts"],"names":[],"mappings":"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"}
|