rez_core 2.0.0 → 2.0.1

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.
Files changed (65) hide show
  1. package/dist/module/enterprise/entity/enterprise.entity.d.ts +1 -1
  2. package/dist/module/enterprise/entity/enterprise.entity.js +2 -2
  3. package/dist/module/enterprise/entity/enterprise.entity.js.map +1 -1
  4. package/dist/module/enterprise/entity/organization.entity.d.ts +1 -1
  5. package/dist/module/enterprise/entity/organization.entity.js +2 -2
  6. package/dist/module/enterprise/entity/organization.entity.js.map +1 -1
  7. package/dist/module/filter/entity/saved-filter-master.entity.d.ts +0 -1
  8. package/dist/module/filter/entity/saved-filter-master.entity.js +0 -4
  9. package/dist/module/filter/entity/saved-filter-master.entity.js.map +1 -1
  10. package/dist/module/master/service/master.service.js +31 -15
  11. package/dist/module/master/service/master.service.js.map +1 -1
  12. package/dist/module/meta/entity/entity-table-column.entity.d.ts +0 -1
  13. package/dist/module/meta/entity/entity-table-column.entity.js +0 -4
  14. package/dist/module/meta/entity/entity-table-column.entity.js.map +1 -1
  15. package/dist/module/meta/entity/entity-table.entity.d.ts +0 -1
  16. package/dist/module/meta/entity/entity-table.entity.js +0 -4
  17. package/dist/module/meta/entity/entity-table.entity.js.map +1 -1
  18. package/dist/module/module/controller/menu.controller.js +2 -1
  19. package/dist/module/module/controller/menu.controller.js.map +1 -1
  20. package/dist/module/module/controller/module-access.controller.js +2 -1
  21. package/dist/module/module/controller/module-access.controller.js.map +1 -1
  22. package/dist/module/module/entity/menu.entity.d.ts +1 -0
  23. package/dist/module/module/entity/menu.entity.js +4 -0
  24. package/dist/module/module/entity/menu.entity.js.map +1 -1
  25. package/dist/module/module/entity/module-access.entity.d.ts +1 -1
  26. package/dist/module/module/entity/module-access.entity.js +1 -1
  27. package/dist/module/module/entity/module-access.entity.js.map +1 -1
  28. package/dist/module/module/entity/module.entity.d.ts +1 -0
  29. package/dist/module/module/entity/module.entity.js +4 -0
  30. package/dist/module/module/entity/module.entity.js.map +1 -1
  31. package/dist/module/module/repository/menu.repository.d.ts +3 -3
  32. package/dist/module/module/repository/menu.repository.js +12 -8
  33. package/dist/module/module/repository/menu.repository.js.map +1 -1
  34. package/dist/module/module/repository/module-access.repository.js +1 -1
  35. package/dist/module/module/repository/module-access.repository.js.map +1 -1
  36. package/dist/module/module/service/menu.service.d.ts +1 -1
  37. package/dist/module/module/service/menu.service.js +4 -4
  38. package/dist/module/module/service/menu.service.js.map +1 -1
  39. package/dist/module/user/entity/role.entity.d.ts +0 -1
  40. package/dist/module/user/entity/role.entity.js +0 -4
  41. package/dist/module/user/entity/role.entity.js.map +1 -1
  42. package/dist/module/user/entity/user-role-mapping.entity.d.ts +1 -0
  43. package/dist/module/user/entity/user-role-mapping.entity.js +4 -0
  44. package/dist/module/user/entity/user-role-mapping.entity.js.map +1 -1
  45. package/dist/module/user/service/role.service.js +2 -2
  46. package/dist/module/user/service/role.service.js.map +1 -1
  47. package/dist/tsconfig.build.tsbuildinfo +1 -1
  48. package/package.json +1 -1
  49. package/src/module/enterprise/entity/enterprise.entity.ts +2 -2
  50. package/src/module/enterprise/entity/organization.entity.ts +2 -2
  51. package/src/module/filter/entity/saved-filter-master.entity.ts +0 -3
  52. package/src/module/master/service/master.service.ts +31 -15
  53. package/src/module/meta/entity/entity-table-column.entity.ts +1 -2
  54. package/src/module/meta/entity/entity-table.entity.ts +0 -2
  55. package/src/module/module/controller/menu.controller.ts +2 -1
  56. package/src/module/module/controller/module-access.controller.ts +2 -2
  57. package/src/module/module/entity/menu.entity.ts +3 -0
  58. package/src/module/module/entity/module-access.entity.ts +1 -1
  59. package/src/module/module/entity/module.entity.ts +3 -0
  60. package/src/module/module/repository/menu.repository.ts +48 -43
  61. package/src/module/module/repository/module-access.repository.ts +1 -1
  62. package/src/module/module/service/menu.service.ts +4 -4
  63. package/src/module/user/entity/role.entity.ts +0 -3
  64. package/src/module/user/entity/user-role-mapping.entity.ts +3 -0
  65. package/src/module/user/service/role.service.ts +2 -2
@@ -8,6 +8,6 @@ export declare class EnterpriseData {
8
8
  modified_by: number;
9
9
  created_date: Date;
10
10
  modified_date: Date;
11
- app_code: string;
11
+ appcode: string;
12
12
  app_url_name: string;
13
13
  }
@@ -51,9 +51,9 @@ __decorate([
51
51
  __metadata("design:type", Date)
52
52
  ], EnterpriseData.prototype, "modified_date", void 0);
53
53
  __decorate([
54
- (0, typeorm_1.Column)({ name: 'app_code', type: 'varchar', nullable: true, length: 50 }),
54
+ (0, typeorm_1.Column)({ name: 'appcode', type: 'varchar', nullable: true, length: 50 }),
55
55
  __metadata("design:type", String)
56
- ], EnterpriseData.prototype, "app_code", void 0);
56
+ ], EnterpriseData.prototype, "appcode", void 0);
57
57
  __decorate([
58
58
  (0, typeorm_1.Column)({ name: 'app_url_name', type: 'varchar', nullable: true, length: 50 }),
59
59
  __metadata("design:type", String)
@@ -1 +1 @@
1
- {"version":3,"file":"enterprise.entity.js","sourceRoot":"","sources":["../../../../src/module/enterprise/entity/enterprise.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiE;AAG1D,IAAM,cAAc,GAApB,MAAM,cAAc;CAiC1B,CAAA;AAjCY,wCAAc;AAEzB;IADC,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;;0CAC5C;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;mDACzD;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;4CACzD;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;4CACzD;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;8CACzD;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDACzC;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACzC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACrD,IAAI;oDAAC;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACrD,IAAI;qDAAC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;gDACzD;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;oDACzD;yBAhCV,cAAc;IAD1B,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC;GACrB,cAAc,CAiC1B"}
1
+ {"version":3,"file":"enterprise.entity.js","sourceRoot":"","sources":["../../../../src/module/enterprise/entity/enterprise.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiE;AAG1D,IAAM,cAAc,GAApB,MAAM,cAAc;CAiC1B,CAAA;AAjCY,wCAAc;AAEzB;IADC,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;;0CAC5C;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;mDACzD;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;4CACzD;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;4CACzD;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;8CACzD;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDACzC;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACzC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACrD,IAAI;oDAAC;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACrD,IAAI;qDAAC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;+CACzD;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;;oDACzD;yBAhCV,cAAc;IAD1B,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC;GACrB,cAAc,CAiC1B"}
@@ -2,7 +2,7 @@ export declare class OrganizationData {
2
2
  id: number;
3
3
  enterprise_id: number;
4
4
  code: string;
5
- appCode: string;
5
+ appcode: string;
6
6
  name: string;
7
7
  status: string;
8
8
  seq_no: number;
@@ -27,9 +27,9 @@ __decorate([
27
27
  __metadata("design:type", String)
28
28
  ], OrganizationData.prototype, "code", void 0);
29
29
  __decorate([
30
- (0, typeorm_1.Column)({ name: 'app_code', nullable: true }),
30
+ (0, typeorm_1.Column)({ name: 'appcode', nullable: true }),
31
31
  __metadata("design:type", String)
32
- ], OrganizationData.prototype, "appCode", void 0);
32
+ ], OrganizationData.prototype, "appcode", void 0);
33
33
  __decorate([
34
34
  (0, typeorm_1.Column)({ name: 'name', nullable: true }),
35
35
  __metadata("design:type", String)
@@ -1 +1 @@
1
- {"version":3,"file":"organization.entity.js","sourceRoot":"","sources":["../../../../src/module/enterprise/entity/organization.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiE;AAG1D,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;CA4E5B,CAAA;AA5EY,4CAAgB;AAE3B;IADC,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;4CACzC;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;uDACzB;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CAC5B;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDAC7B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CAC5B;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC7C;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC5B;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDAC5B;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDAC5B;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACnC,IAAI;sDAAC;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDAC5B;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACnC,IAAI;uDAAC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wDAC5B;AAGvB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDAC1B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDAC5B;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,sBAAsB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8DAC5B;AAG7B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDAC5B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CAC5B;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4DAC5B;AAG3B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4DAC5B;AAG3B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,mBAAmB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2DAC5B;AAG1B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8DAC9B;AAG7B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,qBAAqB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gEACzB;AAO/B;IALC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,mBAAmB;QACzB,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,IAAI;KACf,CAAC;;2DACwB;2BA3Ef,gBAAgB;IAD5B,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;GACvB,gBAAgB,CA4E5B"}
1
+ {"version":3,"file":"organization.entity.js","sourceRoot":"","sources":["../../../../src/module/enterprise/entity/organization.entity.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,6 @@
1
1
  import { BaseEntity } from "src/module/meta/entity/base-entity.entity";
2
2
  export declare class SavedFilterMaster extends BaseEntity {
3
3
  constructor();
4
- app_code: string;
5
4
  mapped_entity_type: string;
6
5
  user_id: number;
7
6
  is_default: boolean;
@@ -20,10 +20,6 @@ let SavedFilterMaster = class SavedFilterMaster extends base_entity_entity_1.Bas
20
20
  }
21
21
  };
22
22
  exports.SavedFilterMaster = SavedFilterMaster;
23
- __decorate([
24
- (0, typeorm_1.Column)({ length: 50, type: 'varchar', nullable: true }),
25
- __metadata("design:type", String)
26
- ], SavedFilterMaster.prototype, "app_code", void 0);
27
23
  __decorate([
28
24
  (0, typeorm_1.Column)({ length: 50, type: 'varchar', nullable: true }),
29
25
  __metadata("design:type", String)
@@ -1 +1 @@
1
- {"version":3,"file":"saved-filter-master.entity.js","sourceRoot":"","sources":["../../../../src/module/filter/entity/saved-filter-master.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uEAA4E;AAC5E,6EAAuE;AACvE,qCAAyC;AAGlC,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,+BAAU;IAC/C;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,8CAA4B,CAAC;IAClD,CAAC;CAaF,CAAA;AAjBY,8CAAiB;AAO5B;IADC,IAAA,gBAAM,EAAC,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACvC;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6DAC7B;AAG3B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDACxB;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;qDACxB;4BAhBT,iBAAiB;IAD7B,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,CAAC;;GAC9B,iBAAiB,CAiB7B"}
1
+ {"version":3,"file":"saved-filter-master.entity.js","sourceRoot":"","sources":["../../../../src/module/filter/entity/saved-filter-master.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uEAA4E;AAC5E,6EAAuE;AACvE,qCAAyC;AAGlC,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,+BAAU;IAC/C;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,8CAA4B,CAAC;IAClD,CAAC;CAUF,CAAA;AAdY,8CAAiB;AAO5B;IADC,IAAA,gBAAM,EAAC,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6DAC7B;AAG3B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDACxB;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;qDACxB;4BAbT,iBAAiB;IAD7B,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,CAAC;;GAC9B,iBAAiB,CAc7B"}
@@ -219,17 +219,27 @@ let MasterService = class MasterService {
219
219
  });
220
220
  continue;
221
221
  }
222
+ const existingError = errors.find((e) => e.row === i + 1);
222
223
  if (refData[0].organization_id !== loggedInUser.organization_id) {
223
- errors.push({
224
- row: i + 1,
225
- errors: [
226
- {
227
- field: attr.name,
228
- message: `Reference entity with code ${row[attr.attribute_key]} does not belong to the organization`,
229
- },
230
- ],
231
- });
232
- continue;
224
+ if (existingError) {
225
+ existingError.errors.push({
226
+ field: attr.name,
227
+ message: `Reference entity not found for code: ${row[attr.attribute_key]} does not belong to the organization`,
228
+ });
229
+ continue;
230
+ }
231
+ else {
232
+ errors.push({
233
+ row: i + 1,
234
+ errors: [
235
+ {
236
+ field: attr.name,
237
+ message: `Reference entity with code ${row[attr.attribute_key]} does not belong to the organization`,
238
+ },
239
+ ],
240
+ });
241
+ continue;
242
+ }
233
243
  }
234
244
  row[attr.attribute_key] = refData[0].id;
235
245
  }
@@ -313,18 +323,24 @@ let MasterService = class MasterService {
313
323
  row.entity_type = entityType;
314
324
  row.organization_id = loggedInUser.organization_id;
315
325
  const rowErrors = await this.entityValidationService.validateExcelEntityData(row, entityMaster);
326
+ const existingError = errors.find((e) => e.row === i + 1);
316
327
  if (rowErrors?.length > 0) {
317
- errors.push({
318
- row: i + 1,
319
- errors: rowErrors,
320
- });
328
+ if (existingError) {
329
+ existingError.errors.push(...rowErrors);
330
+ }
331
+ else {
332
+ errors.push({
333
+ row: i + 1,
334
+ errors: rowErrors,
335
+ });
336
+ }
321
337
  }
322
338
  }
323
339
  if (errors.length > 0) {
324
340
  throw new common_1.BadRequestException({
325
341
  status: false,
326
342
  message: `Validation errors found in the uploaded data.`,
327
- details: errors,
343
+ error: errors,
328
344
  });
329
345
  }
330
346
  for (const row of data) {
@@ -1 +1 @@
1
- {"version":3,"file":"master.service.js","sourceRoot":"","sources":["../../../../src/module/master/service/master.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"master.service.js","sourceRoot":"","sources":["../../../../src/module/master/service/master.service.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,6 @@
1
1
  import { BaseEntity } from './base-entity.entity';
2
2
  export declare class EntityTableColumn extends BaseEntity {
3
3
  constructor();
4
- app_code: string;
5
4
  mapped_entity_type: string;
6
5
  menu_code: string;
7
6
  table_name: string;
@@ -20,10 +20,6 @@ let EntityTableColumn = class EntityTableColumn extends base_entity_entity_1.Bas
20
20
  }
21
21
  };
22
22
  exports.EntityTableColumn = EntityTableColumn;
23
- __decorate([
24
- (0, typeorm_1.Column)({ name: 'app_code', nullable: true }),
25
- __metadata("design:type", String)
26
- ], EntityTableColumn.prototype, "app_code", void 0);
27
23
  __decorate([
28
24
  (0, typeorm_1.Column)({ name: 'mapped_entity_type', nullable: true }),
29
25
  __metadata("design:type", String)
@@ -1 +1 @@
1
- {"version":3,"file":"entity-table-column.entity.js","sourceRoot":"","sources":["../../../../src/module/meta/entity/entity-table-column.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uEAAiF;AACjF,qCAAyC;AACzC,6DAAkD;AAG3C,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,+BAAU;IAC/C;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,8CAA4B,CAAC;IAClD,CAAC;CA6CF,CAAA;AAjDY,8CAAiB;AAO5B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDAC5B;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6DAC5B;AAG3B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDAC5B;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDAC5B;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDAC5B;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDAC5B;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDAC5B;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wDAC5B;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDAC5B;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDAC5B;AAQlB;IANC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,kBAAkB;QACxB,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,EAAE;KACX,CAAC;;2DACuB;AAGzB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0DAC7C;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDAC5B;4BAhDL,iBAAiB;IAD7B,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,CAAC;;GAC9B,iBAAiB,CAiD7B"}
1
+ {"version":3,"file":"entity-table-column.entity.js","sourceRoot":"","sources":["../../../../src/module/meta/entity/entity-table-column.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uEAAiF;AACjF,qCAAyC;AACzC,6DAAkD;AAG3C,IAAM,iBAAiB,GAAvB,MAAM,iBAAkB,SAAQ,+BAAU;IAC/C;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,8CAA4B,CAAC;IAClD,CAAC;CA4CF,CAAA;AAhDY,8CAAiB;AAS5B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6DAC5B;AAG3B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDAC5B;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDAC5B;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDAC5B;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDAC5B;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDAC5B;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wDAC5B;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDAC5B;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDAC5B;AAQlB;IANC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,kBAAkB;QACxB,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,EAAE;KACX,CAAC;;2DACuB;AAGzB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0DAC7C;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDAC5B;4BA/CL,iBAAiB;IAD7B,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,CAAC;;GAC9B,iBAAiB,CAgD7B"}
@@ -1,7 +1,6 @@
1
1
  import { BaseEntity } from './base-entity.entity';
2
2
  export declare class EntityTable extends BaseEntity {
3
3
  constructor();
4
- app_code: string;
5
4
  mapped_entity_type: string;
6
5
  menu_code: string;
7
6
  category: string;
@@ -20,10 +20,6 @@ let EntityTable = class EntityTable extends base_entity_entity_1.BaseEntity {
20
20
  }
21
21
  };
22
22
  exports.EntityTable = EntityTable;
23
- __decorate([
24
- (0, typeorm_1.Column)({ name: 'app_code', nullable: true }),
25
- __metadata("design:type", String)
26
- ], EntityTable.prototype, "app_code", void 0);
27
23
  __decorate([
28
24
  (0, typeorm_1.Column)({ name: 'mapped_entity_type', nullable: true }),
29
25
  __metadata("design:type", String)
@@ -1 +1 @@
1
- {"version":3,"file":"entity-table.entity.js","sourceRoot":"","sources":["../../../../src/module/meta/entity/entity-table.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyC;AACzC,6DAAkD;AAClD,uEAA2E;AAGpE,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,+BAAU;IACzC;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,wCAAsB,CAAC;IAC5C,CAAC;CA2CF,CAAA;AA/CY,kCAAW;AAOtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CAC5B;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDAC5B;AAG3B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CAC5B;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CAC5B;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CAC5B;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDAC5B;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDAC5B;AAGvB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC5B;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC5B;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CAC5B;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CAC5B;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC5B;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CAC5B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;;iDAC3B;sBA9CV,WAAW;IADvB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;;GACvB,WAAW,CA+CvB"}
1
+ {"version":3,"file":"entity-table.entity.js","sourceRoot":"","sources":["../../../../src/module/meta/entity/entity-table.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyC;AACzC,6DAAkD;AAClD,uEAA2E;AAGpE,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,+BAAU;IACzC;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,wCAAsB,CAAC;IAC5C,CAAC;CAyCF,CAAA;AA7CY,kCAAW;AAQtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDAC5B;AAG3B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CAC5B;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CAC5B;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CAC5B;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDAC5B;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDAC5B;AAGvB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC5B;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC5B;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CAC5B;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CAC5B;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC5B;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CAC5B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;;iDAC3B;sBA5CV,WAAW;IADvB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;;GACvB,WAAW,CA6CvB"}
@@ -22,7 +22,8 @@ let MenuController = class MenuController {
22
22
  }
23
23
  async getMenu(req) {
24
24
  const userId = req.user.userId;
25
- return this.menuService.getUserMenu(userId);
25
+ const appcode = req.user.appcode;
26
+ return this.menuService.getUserMenu(userId, appcode);
26
27
  }
27
28
  };
28
29
  exports.MenuController = MenuController;
@@ -1 +1 @@
1
- {"version":3,"file":"menu.controller.js","sourceRoot":"","sources":["../../../../src/module/module/controller/menu.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAqE;AACrE,0DAAsD;AACtD,2DAAgE;AAGzD,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YAA6B,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IAInD,AAAN,KAAK,CAAC,OAAO,CAAY,GAAG;QAC1B,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;QAC/B,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;CACF,CAAA;AATY,wCAAc;AAKnB;IAFL,IAAA,kBAAS,EAAC,wBAAY,CAAC;IACvB,IAAA,YAAG,GAAE;IACS,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;6CAGvB;yBARU,cAAc;IAD1B,IAAA,mBAAU,EAAC,MAAM,CAAC;qCAEyB,0BAAW;GAD1C,cAAc,CAS1B"}
1
+ {"version":3,"file":"menu.controller.js","sourceRoot":"","sources":["../../../../src/module/module/controller/menu.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAqE;AACrE,0DAAsD;AACtD,2DAAgE;AAGzD,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YAA6B,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IAInD,AAAN,KAAK,CAAC,OAAO,CAAY,GAAG;QAC1B,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;QAC/B,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC;QACjC,OAAO,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,MAAM,EAAC,OAAO,CAAC,CAAC;IACtD,CAAC;CACF,CAAA;AAVY,wCAAc;AAKnB;IAFL,IAAA,kBAAS,EAAC,wBAAY,CAAC;IACvB,IAAA,YAAG,GAAE;IACS,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;6CAIvB;yBATU,cAAc;IAD1B,IAAA,mBAAU,EAAC,MAAM,CAAC;qCAEyB,0BAAW;GAD1C,cAAc,CAU1B"}
@@ -41,7 +41,8 @@ let ModuleAccessController = class ModuleAccessController {
41
41
  }
42
42
  async getModuleUIConfig(moduleCode, req) {
43
43
  const userId = req.user.userId;
44
- const roles = await this.menuRepository.getUserRoles(userId);
44
+ const appcode = req.user.appcode;
45
+ const roles = await this.menuRepository.getUserRoles(userId, appcode);
45
46
  if (!roles || roles.length === 0) {
46
47
  throw new common_1.BadRequestException('User has no roles');
47
48
  }
@@ -1 +1 @@
1
- {"version":3,"file":"module-access.controller.js","sourceRoot":"","sources":["../../../../src/module/module/controller/module-access.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAiI;AACjI,4EAAuE;AACvE,2DAAgE;AAIhE,mEAA+D;AAIxD,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IACjC,YAA6B,mBAAwC,EACxC,cAA8B;QAD9B,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,mBAAc,GAAd,cAAc,CAAgB;IACxD,CAAC;IAGE,AAAN,KAAK,CAAC,QAAQ;QACZ,OAAO,IAAI,CAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAC;IAC7C,CAAC;IAGK,AAAN,KAAK,CAAC,UAAU;QACd,OAAO,IAAI,CAAC,mBAAmB,CAAC,UAAU,EAAE,CAAC;IAC/C,CAAC;IAGK,AAAN,KAAK,CAAC,gBAAgB,CAAiB,OAAe;QACpD,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACnD,OAAO,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAChE,CAAC;IAGK,AAAN,KAAK,CAAC,cAAc,CAAmB,UAAkB;QACvD,MAAM,YAAY,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACvD,OAAO,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;IAC/D,CAAC;IAGK,AAAN,KAAK,CAAC,kBAAkB,CAAS,gBAAuB;QACtD,OAAO,IAAI,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;IACvE,CAAC;IAKK,AAAN,KAAK,CAAC,iBAAiB,CAAuB,UAAkB,EAAa,GAAG;QAC9E,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;QAE/B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAE7D,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,4BAAmB,CAAC,mBAAmB,CAAC,CAAC;QACrD,CAAC;QAED,OAAO,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC7F,CAAC;CAIF,CAAA;AAjDY,wDAAsB;AAM3B;IADL,IAAA,YAAG,EAAC,OAAO,CAAC;;;;sDAGZ;AAGK;IADL,IAAA,YAAG,EAAC,SAAS,CAAC;;;;wDAGd;AAGK;IADL,IAAA,YAAG,EAAC,gBAAgB,CAAC;IACE,WAAA,IAAA,cAAK,EAAC,OAAO,CAAC,CAAA;;;;8DAGrC;AAGK;IADL,IAAA,YAAG,EAAC,cAAc,CAAC;IACE,WAAA,IAAA,cAAK,EAAC,SAAS,CAAC,CAAA;;;;4DAGrC;AAGK;IADL,IAAA,aAAI,EAAC,QAAQ,CAAC;IACW,WAAA,IAAA,aAAI,GAAE,CAAA;;;;gEAE/B;AAKK;IADL,IAAA,YAAG,EAAC,WAAW,CAAC;IACQ,WAAA,IAAA,cAAK,EAAC,aAAa,CAAC,CAAA;IAAsB,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;+DAU3E;iCA7CU,sBAAsB;IAFlC,IAAA,mBAAU,EAAC,eAAe,CAAC;IAC3B,IAAA,kBAAS,EAAC,wBAAY,CAAC;qCAE4B,2CAAmB;QACxB,gCAAc;GAFhD,sBAAsB,CAiDlC"}
1
+ {"version":3,"file":"module-access.controller.js","sourceRoot":"","sources":["../../../../src/module/module/controller/module-access.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAiI;AACjI,4EAAuE;AACvE,2DAAgE;AAIhE,mEAA+D;AAIxD,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IACjC,YAA6B,mBAAwC,EACxC,cAA8B;QAD9B,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,mBAAc,GAAd,cAAc,CAAgB;IACxD,CAAC;IAGE,AAAN,KAAK,CAAC,QAAQ;QACZ,OAAO,IAAI,CAAC,mBAAmB,CAAC,QAAQ,EAAE,CAAC;IAC7C,CAAC;IAGK,AAAN,KAAK,CAAC,UAAU;QACd,OAAO,IAAI,CAAC,mBAAmB,CAAC,UAAU,EAAE,CAAC;IAC/C,CAAC;IAGK,AAAN,KAAK,CAAC,gBAAgB,CAAiB,OAAe;QACpD,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACnD,OAAO,IAAI,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAChE,CAAC;IAGK,AAAN,KAAK,CAAC,cAAc,CAAmB,UAAkB;QACvD,MAAM,YAAY,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACvD,OAAO,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;IAC/D,CAAC;IAGK,AAAN,KAAK,CAAC,kBAAkB,CAAS,gBAAuB;QACtD,OAAO,IAAI,CAAC,mBAAmB,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;IACvE,CAAC;IAKK,AAAN,KAAK,CAAC,iBAAiB,CAAuB,UAAkB,EAAa,GAAG;QAC9E,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC;QAC/B,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC;QACjC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,MAAM,EAAC,OAAO,CAAC,CAAC;QAErE,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,4BAAmB,CAAC,mBAAmB,CAAC,CAAC;QACrD,CAAC;QAED,OAAO,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC7F,CAAC;CAIF,CAAA;AAjDY,wDAAsB;AAM3B;IADL,IAAA,YAAG,EAAC,OAAO,CAAC;;;;sDAGZ;AAGK;IADL,IAAA,YAAG,EAAC,SAAS,CAAC;;;;wDAGd;AAGK;IADL,IAAA,YAAG,EAAC,gBAAgB,CAAC;IACE,WAAA,IAAA,cAAK,EAAC,OAAO,CAAC,CAAA;;;;8DAGrC;AAGK;IADL,IAAA,YAAG,EAAC,cAAc,CAAC;IACE,WAAA,IAAA,cAAK,EAAC,SAAS,CAAC,CAAA;;;;4DAGrC;AAGK;IADL,IAAA,aAAI,EAAC,QAAQ,CAAC;IACW,WAAA,IAAA,aAAI,GAAE,CAAA;;;;gEAE/B;AAKK;IADL,IAAA,YAAG,EAAC,WAAW,CAAC;IACQ,WAAA,IAAA,cAAK,EAAC,aAAa,CAAC,CAAA;IAAsB,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;+DAU3E;iCA7CU,sBAAsB;IAFlC,IAAA,mBAAU,EAAC,eAAe,CAAC;IAC3B,IAAA,kBAAS,EAAC,wBAAY,CAAC;qCAE4B,2CAAmB;QACxB,gCAAc;GAFhD,sBAAsB,CAiDlC"}
@@ -10,4 +10,5 @@ export declare class MenuData {
10
10
  parent_id: number;
11
11
  parent_code: string;
12
12
  ui_visible: number;
13
+ appcode: string;
13
14
  }
@@ -58,6 +58,10 @@ __decorate([
58
58
  (0, typeorm_1.Column)({ type: 'int', nullable: true }),
59
59
  __metadata("design:type", Number)
60
60
  ], MenuData.prototype, "ui_visible", void 0);
61
+ __decorate([
62
+ (0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
63
+ __metadata("design:type", String)
64
+ ], MenuData.prototype, "appcode", void 0);
61
65
  exports.MenuData = MenuData = __decorate([
62
66
  (0, typeorm_1.Entity)({ name: 'cr_menu' })
63
67
  ], MenuData);
@@ -1 +1 @@
1
- {"version":3,"file":"menu.entity.js","sourceRoot":"","sources":["../../../../src/module/module/entity/menu.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiE;AAG1D,IAAM,QAAQ,GAAd,MAAM,QAAQ;CAiCpB,CAAA;AAjCY,4BAAQ;AAEnB;IADC,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;oCAC7B;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sCAC5C;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACrC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCAC1C;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACxC;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sCAC/B;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sCAC5C;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CACpC;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACtB;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACrC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACrB;mBAhCR,QAAQ;IADpB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;GACf,QAAQ,CAiCpB"}
1
+ {"version":3,"file":"menu.entity.js","sourceRoot":"","sources":["../../../../src/module/module/entity/menu.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiE;AAG1D,IAAM,QAAQ,GAAd,MAAM,QAAQ;CAoCpB,CAAA;AApCY,4BAAQ;AAEnB;IADC,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;oCAC7B;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sCAC5C;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACrC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCAC1C;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACxC;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sCAC/B;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sCAC5C;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CACpC;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACtB;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACrC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACrB;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCAC5B;mBAnCL,QAAQ;IADpB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;GACf,QAAQ,CAoCpB"}
@@ -4,5 +4,5 @@ export declare class ModuleAccess {
4
4
  role_code: string;
5
5
  access_flag: number;
6
6
  action_type: string;
7
- app_code: string;
7
+ appcode: string;
8
8
  }
@@ -37,7 +37,7 @@ __decorate([
37
37
  __decorate([
38
38
  (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
39
39
  __metadata("design:type", String)
40
- ], ModuleAccess.prototype, "app_code", void 0);
40
+ ], ModuleAccess.prototype, "appcode", void 0);
41
41
  exports.ModuleAccess = ModuleAccess = __decorate([
42
42
  (0, typeorm_1.Entity)({ name: 'cr_module_access' })
43
43
  ], ModuleAccess);
@@ -1 +1 @@
1
- {"version":3,"file":"module-access.entity.js","sourceRoot":"","sources":["../../../../src/module/module/entity/module-access.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiE;AAG1D,IAAM,YAAY,GAAlB,MAAM,YAAY;CAkBxB,CAAA;AAlBY,oCAAY;AAEvB;IADC,IAAA,gCAAsB,GAAE;;wCACd;AAGX;IADC,IAAA,gBAAM,EAAC,EAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;;iDACnC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACtC;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACnB;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACpC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;;8CACtC;uBAjBN,YAAY;IADxB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC;GACxB,YAAY,CAkBxB"}
1
+ {"version":3,"file":"module-access.entity.js","sourceRoot":"","sources":["../../../../src/module/module/entity/module-access.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiE;AAG1D,IAAM,YAAY,GAAlB,MAAM,YAAY;CAkBxB,CAAA;AAlBY,oCAAY;AAEvB;IADC,IAAA,gCAAsB,GAAE;;wCACd;AAGX;IADC,IAAA,gBAAM,EAAC,EAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;;iDACnC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACtC;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACnB;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACpC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAC,CAAC;;6CACvC;uBAjBL,YAAY;IADxB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC;GACxB,YAAY,CAkBxB"}
@@ -12,4 +12,5 @@ export declare class ModuleData {
12
12
  title: string;
13
13
  component_name: string;
14
14
  ui_config: JSON;
15
+ appcode: string;
15
16
  }
@@ -66,6 +66,10 @@ __decorate([
66
66
  (0, typeorm_1.Column)({ type: 'json', nullable: true }),
67
67
  __metadata("design:type", Object)
68
68
  ], ModuleData.prototype, "ui_config", void 0);
69
+ __decorate([
70
+ (0, typeorm_1.Column)({ type: 'varchar', length: 100, nullable: true }),
71
+ __metadata("design:type", String)
72
+ ], ModuleData.prototype, "appcode", void 0);
69
73
  exports.ModuleData = ModuleData = __decorate([
70
74
  (0, typeorm_1.Entity)({ name: 'cr_module' })
71
75
  ], ModuleData);
@@ -1 +1 @@
1
- {"version":3,"file":"module.entity.js","sourceRoot":"","sources":["../../../../src/module/module/entity/module.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiE;AAG1D,IAAM,UAAU,GAAhB,MAAM,UAAU;CAuCtB,CAAA;AAvCY,gCAAU;AAErB;IADC,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;sCAC7B;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCAC5C;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACrC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACxC;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CAC1C;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACpC;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACtB;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACrC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CACrB;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACrC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCAC3C;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDAClC;AAGvB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACzB;qBAtCL,UAAU;IADtB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;GACjB,UAAU,CAuCtB"}
1
+ {"version":3,"file":"module.entity.js","sourceRoot":"","sources":["../../../../src/module/module/entity/module.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiE;AAG1D,IAAM,UAAU,GAAhB,MAAM,UAAU;CA0CtB,CAAA;AA1CY,gCAAU;AAErB;IADC,IAAA,gCAAsB,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;;sCAC7B;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCAC5C;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACrC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACxC;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CAC1C;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACpC;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACtB;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACrC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CACrB;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACrC;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCAC3C;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDAClC;AAGvB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACzB;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACzC;qBAzCL,UAAU;IADtB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;GACjB,UAAU,CA0CtB"}
@@ -3,7 +3,7 @@ import { MenuData } from '../entity/menu.entity';
3
3
  export declare class MenuRepository extends Repository<MenuData> {
4
4
  private readonly dataSource;
5
5
  constructor(dataSource: DataSource);
6
- getUserRoles(userId: number): Promise<number[]>;
7
- getAccessibleModules(roleIds: number[]): Promise<string[]>;
8
- getMenuItems(moduleCodes: string[]): Promise<MenuData[]>;
6
+ getUserRoles(userId: number, appcode: string): Promise<number[]>;
7
+ getAccessibleModules(roleIds: number[], appCode: string): Promise<string[]>;
8
+ getMenuItems(moduleCodes: string[], appcode: string): Promise<MenuData[]>;
9
9
  }
@@ -21,16 +21,18 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
21
21
  super(menu_entity_1.MenuData, dataSource.createEntityManager());
22
22
  this.dataSource = dataSource;
23
23
  }
24
- async getUserRoles(userId) {
24
+ async getUserRoles(userId, appcode) {
25
25
  const roles = await this.dataSource
26
26
  .getRepository(user_role_mapping_entity_1.UserRoleMapping)
27
- .createQueryBuilder('userRoleMapping')
28
- .select('userRoleMapping.role_id')
29
- .where('userRoleMapping.user_id = :userId', { userId })
30
- .getMany();
31
- return roles.map((role) => role.role_id);
27
+ .createQueryBuilder('urm')
28
+ .innerJoin('cr_role', 'role', 'role.id = urm.role_id')
29
+ .select('urm.role_id')
30
+ .where('urm.user_id = :userId', { userId })
31
+ .andWhere('role.appcode = :appcode', { appcode })
32
+ .getRawMany();
33
+ return roles.map((r) => r.urm_role_id);
32
34
  }
33
- async getAccessibleModules(roleIds) {
35
+ async getAccessibleModules(roleIds, appCode) {
34
36
  const roleCodes = await this.dataSource
35
37
  .getRepository(role_entity_1.Role)
36
38
  .createQueryBuilder('role')
@@ -47,13 +49,15 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
47
49
  .select('moduleAccess.module_code')
48
50
  .where('moduleAccess.role_code IN (:...codes)', { codes })
49
51
  .andWhere('moduleAccess.access_flag > 0')
52
+ .andWhere('LOWER(moduleAccess.appcode) = LOWER(:appCode)', { appCode })
50
53
  .getMany();
51
54
  return modules.map((module) => module.module_code);
52
55
  }
53
- async getMenuItems(moduleCodes) {
56
+ async getMenuItems(moduleCodes, appcode) {
54
57
  const menuItems = await this.createQueryBuilder('menu')
55
58
  .leftJoin('cr_module', 'module', 'menu.module_code = module.module_code')
56
59
  .where('menu.module_code IN (:...moduleCodes)', { moduleCodes })
60
+ .andWhere('LOWER(module.appcode) = LOWER(:appcode)', { appcode })
57
61
  .select([
58
62
  'menu.*',
59
63
  'module.component_name AS component',
@@ -1 +1 @@
1
- {"version":3,"file":"menu.repository.js","sourceRoot":"","sources":["../../../../src/module/module/repository/menu.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAAiD;AACjD,uDAAiD;AACjD,yEAA8D;AAC9D,yFAAkF;AAClF,+DAA0D;AAGnD,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,oBAAoB;IACtD,YAA6B,UAAsB;QACjD,KAAK,CAAC,sBAAQ,EAAE,UAAU,CAAC,mBAAmB,EAAE,CAAC,CAAC;QADvB,eAAU,GAAV,UAAU,CAAY;IAEnD,CAAC;IAKD,KAAK,CAAC,YAAY,CAAC,MAAc;QAC/B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU;aAChC,aAAa,CAAC,0CAAe,CAAC;aAC9B,kBAAkB,CAAC,iBAAiB,CAAC;aACrC,MAAM,CAAC,yBAAyB,CAAC;aACjC,KAAK,CAAC,mCAAmC,EAAE,EAAE,MAAM,EAAE,CAAC;aACtD,OAAO,EAAE,CAAC;QAEb,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IAKD,KAAK,CAAC,oBAAoB,CAAC,OAAiB;QAE1C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU;aACpC,aAAa,CAAC,kBAAI,CAAC;aACnB,kBAAkB,CAAC,MAAM,CAAC;aAC1B,MAAM,CAAC,WAAW,CAAC;aACnB,KAAK,CAAC,0BAA0B,EAAE,EAAE,OAAO,EAAE,CAAC;aAC9C,OAAO,EAAE,CAAC;QAEb,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEjD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,EAAE,CAAC;QACZ,CAAC;QAGD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU;aAClC,aAAa,CAAC,mCAAY,CAAC;aAC3B,kBAAkB,CAAC,cAAc,CAAC;aAClC,MAAM,CAAC,0BAA0B,CAAC;aAClC,KAAK,CAAC,uCAAuC,EAAE,EAAE,KAAK,EAAE,CAAC;aACzD,QAAQ,CAAC,8BAA8B,CAAC;aACxC,OAAO,EAAE,CAAC;QAEb,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,WAAqB;QACtC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC;aACpD,QAAQ,CAAC,WAAW,EAAE,QAAQ,EAAE,uCAAuC,CAAC;aACxE,KAAK,CAAC,uCAAuC,EAAE,EAAE,WAAW,EAAE,CAAC;aAC/D,MAAM,CAAC;YACN,QAAQ;YACR,oCAAoC;YACpC,uBAAuB;YACvB,mCAAmC;SACpC,CAAC;aACD,UAAU,EAAE,CAAC;QAEhB,OAAO,SAAS,CAAC;IACnB,CAAC;CACF,CAAA;AA/DY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;qCAE8B,oBAAU;GADxC,cAAc,CA+D1B"}
1
+ {"version":3,"file":"menu.repository.js","sourceRoot":"","sources":["../../../../src/module/module/repository/menu.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAAiD;AACjD,uDAAiD;AACjD,yEAA8D;AAC9D,yFAAkF;AAClF,+DAA0D;AAGnD,IAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,oBAAoB;IACtD,YAA6B,UAAsB;QACjD,KAAK,CAAC,sBAAQ,EAAE,UAAU,CAAC,mBAAmB,EAAE,CAAC,CAAC;QADvB,eAAU,GAAV,UAAU,CAAY;IAEnD,CAAC;IAKD,KAAK,CAAC,YAAY,CAAC,MAAc,EAAE,OAAe;QAChD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU;aAChC,aAAa,CAAC,0CAAe,CAAC;aAC9B,kBAAkB,CAAC,KAAK,CAAC;aACzB,SAAS,CAAC,SAAS,EAAE,MAAM,EAAE,uBAAuB,CAAC;aACrD,MAAM,CAAC,aAAa,CAAC;aACrB,KAAK,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,CAAC;aAC1C,QAAQ,CAAC,yBAAyB,EAAE,EAAE,OAAO,EAAE,CAAC;aAChD,UAAU,EAAE,CAAC;QAEhB,OAAO,KAAK,CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IAC1C,CAAC;IAKE,KAAK,CAAC,oBAAoB,CAAC,OAAiB,EAAE,OAAe;QAEhE,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,UAAU;aACtC,aAAa,CAAC,kBAAI,CAAC;aACnB,kBAAkB,CAAC,MAAM,CAAC;aAC1B,MAAM,CAAC,WAAW,CAAC;aACnB,KAAK,CAAC,0BAA0B,EAAE,EAAE,OAAO,EAAE,CAAC;aAC9C,OAAO,EAAE,CAAC;QAEb,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEjD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO,EAAE,CAAC;QACZ,CAAC;QAGD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU;aAClC,aAAa,CAAC,mCAAY,CAAC;aAC3B,kBAAkB,CAAC,cAAc,CAAC;aAClC,MAAM,CAAC,0BAA0B,CAAC;aAClC,KAAK,CAAC,uCAAuC,EAAE,EAAE,KAAK,EAAE,CAAC;aACzD,QAAQ,CAAC,8BAA8B,CAAC;aACxC,QAAQ,CAAC,+CAA+C,EAAE,EAAE,OAAO,EAAE,CAAC;aACtE,OAAO,EAAE,CAAC;QAEb,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACnD,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,WAAqB,EAAE,OAAe;QACvD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC;aACpD,QAAQ,CAAC,WAAW,EAAE,QAAQ,EAAE,uCAAuC,CAAC;aACxE,KAAK,CAAC,uCAAuC,EAAE,EAAE,WAAW,EAAE,CAAC;aAC/D,QAAQ,CAAC,yCAAyC,EAAE,EAAE,OAAO,EAAE,CAAC;aAChE,MAAM,CAAC;YACN,QAAQ;YACR,oCAAoC;YACpC,uBAAuB;YACvB,mCAAmC;SACpC,CAAC;aACD,UAAU,EAAE,CAAC;QAEhB,OAAO,SAAS,CAAC;IACnB,CAAC;CAEA,CAAA;AApEY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;qCAE8B,oBAAU;GADxC,cAAc,CAoE1B"}
@@ -105,7 +105,7 @@ let ModuleAccessRepository = class ModuleAccessRepository {
105
105
  role_code: access.role_code,
106
106
  module_code: access.module_code,
107
107
  action_type: access.action_type,
108
- app_code: access.app_code,
108
+ appcode: access.app_code,
109
109
  },
110
110
  });
111
111
  if (existing) {
@@ -1 +1 @@
1
- {"version":3,"file":"module-access.repository.js","sourceRoot":"","sources":["../../../../src/module/module/repository/module-access.repository.ts"],"names":[],"mappings":"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"}
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;AAK9C,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IACjC,YAEmB,QAA0B,EAE1B,UAAkC,EAElC,gBAA0C,EAE1C,gBAA0C;QAN1C,aAAQ,GAAR,QAAQ,CAAkB;QAE1B,eAAU,GAAV,UAAU,CAAwB;QAElC,qBAAgB,GAAhB,gBAAgB,CAA0B;QAE1C,qBAAgB,GAAhB,gBAAgB,CAA0B;IAC1D,CAAC;IAEJ,KAAK,CAAC,QAAQ;QACZ,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QACzC,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACxB,KAAK,EAAE,IAAI,CAAC,IAAI;YAChB,KAAK,EAAE,IAAI,CAAC,EAAE;SACf,CAAC,CAAC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,UAAU;QACd,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;QACnF,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACzB,KAAK,EAAE,GAAG,CAAC,IAAI;YACf,KAAK,EAAE,GAAG,CAAC,EAAE;SACd,CAAC,CAAC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,OAAiB;QACtC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,IAAA,YAAE,EAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QACvE,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE/C,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC;YACtD,KAAK,EAAE,EAAE,SAAS,EAAE,IAAA,YAAE,EAAC,SAAS,CAAC,EAAE;SACpC,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACxB,SAAS,EAAE,IAAI,CAAC,IAAI;YACpB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,UAAU,EAAE,cAAc;iBACvB,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,KAAK,IAAI,CAAC,IAAI,CAAC;iBAChD,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACd,MAAM,EAAE,MAAM,CAAC,WAAW;gBAC1B,MAAM,EAAE,MAAM,CAAC,WAAW;gBAC1B,IAAI,EAAE,MAAM,CAAC,WAAW;aACzB,CAAC,CAAC;SACN,CAAC,CAAC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,UAAoB;QACvC,MAAM,WAAW,GAAG,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,UAAU,CAAC,CAAC,CAAC,KAAK,IAAI;YACnE,CAAC,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,EAAE,CAAC;YACpE,CAAC,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,IAAA,YAAE,EAAC,UAAU,CAAC,EAAE,YAAY,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;QAE3F,IAAI,CAAC,WAAW,CAAC,MAAM;YAAE,OAAO,EAAE,CAAC;QAEnC,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAEtD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU;aAClC,kBAAkB,CAAC,QAAQ,CAAC;aAC5B,KAAK,CACJ,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,6BAA6B,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EACtE,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,IAAI,EAAE,EAAE,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,CACtE;aACA,OAAO,EAAE,CAAC;QAEb,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC;QAEzD,MAAM,cAAc,GAAG,CAAC,SAAiB,EAAS,EAAE,CAClD,OAAO;aACJ,MAAM,CAAC,GAAG,CAAC,EAAE,CACZ,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,SAAS,GAAG,CAAC;YACxC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CACnE;aACA,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACX,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,IAAI,EAAE,GAAG,CAAC,WAAW;YACrB,UAAU,EAAE,aAAa;iBACtB,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,WAAW,KAAK,GAAG,CAAC,WAAW,CAAC;iBACxD,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACd,MAAM,EAAE,MAAM,CAAC,WAAW;gBAC1B,IAAI,EAAE,MAAM,CAAC,WAAW;aACzB,CAAC,CAAC;YACL,MAAM,EAAE,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC;SACrC,CAAC,CAAC,CAAC;QAER,OAAO,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC7B,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,IAAI,EAAE,GAAG,CAAC,WAAW;YACrB,UAAU,EAAE,aAAa;iBACtB,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,WAAW,KAAK,GAAG,CAAC,WAAW,CAAC;iBACxD,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;gBACd,MAAM,EAAE,MAAM,CAAC,WAAW;gBAC1B,IAAI,EAAE,MAAM,CAAC,WAAW;aACzB,CAAC,CAAC;YACL,MAAM,EAAE,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC;SACrC,CAAC,CAAC,CAAC;IACN,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,UAMtB;QACD,IAAI,CAAC;YACH,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE,CAAC;gBAChC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;oBACnD,KAAK,EAAE;wBACL,SAAS,EAAE,MAAM,CAAC,SAAS;wBAC3B,WAAW,EAAE,MAAM,CAAC,WAAW;wBAC/B,WAAW,EAAE,MAAM,CAAC,WAAW;wBAC/B,OAAO,EAAE,MAAM,CAAC,QAAQ;qBACzB;iBACF,CAAC,CAAC;gBAEH,IAAI,QAAQ,EAAE,CAAC;oBACb,QAAQ,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;oBAC1C,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC7C,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;gBACzE,CAAC;YACH,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;YACtD,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAKD,KAAK,CAAC,iBAAiB,CAAC,UAAkB,EAAE,OAAiB;QAC3D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;YAC3C,KAAK,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE;SACnC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,4BAAmB,CAAC,kBAAkB,CAAC,CAAC;QACpD,CAAC;QAED,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YACrC,KAAK,EAAE,EAAE,EAAE,EAAE,IAAA,YAAE,EAAC,OAAO,CAAC,EAAE;SAC3B,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE/C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC;YAC/C,KAAK,EAAE;gBACL,WAAW,EAAE,UAAU;gBACvB,SAAS,EAAE,IAAA,YAAE,EAAC,SAAS,CAAC;gBACxB,WAAW,EAAE,CAAC;aACf;SACF,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAEpE,OAAO;YACL,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,SAAS,EAAE,MAAM,CAAC,SAAS,IAAI,EAAE;YACjC,MAAM,EAAE,aAAa;SACtB,CAAC;IACJ,CAAC;CAIF,CAAA;AAzKY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,kBAAI,CAAC,CAAA;IAEtB,WAAA,IAAA,0BAAgB,EAAC,0BAAU,CAAC,CAAA;IAE5B,WAAA,IAAA,0BAAgB,EAAC,mCAAY,CAAC,CAAA;IAE9B,WAAA,IAAA,0BAAgB,EAAC,mCAAY,CAAC,CAAA;qCALJ,oBAAU;QAER,oBAAU;QAEJ,oBAAU;QAEV,oBAAU;GATpC,sBAAsB,CAyKlC"}
@@ -2,7 +2,7 @@ import { MenuRepository } from '../repository/menu.repository';
2
2
  export declare class MenuService {
3
3
  private readonly menuRepository;
4
4
  constructor(menuRepository: MenuRepository);
5
- getUserMenu(userId: number): Promise<{
5
+ getUserMenu(userId: number, appcode: string): Promise<{
6
6
  menu: any[];
7
7
  }>;
8
8
  private buildMenuHierarchy;
@@ -16,16 +16,16 @@ let MenuService = class MenuService {
16
16
  constructor(menuRepository) {
17
17
  this.menuRepository = menuRepository;
18
18
  }
19
- async getUserMenu(userId) {
20
- const roleCodes = await this.menuRepository.getUserRoles(userId);
19
+ async getUserMenu(userId, appcode) {
20
+ const roleCodes = await this.menuRepository.getUserRoles(userId, appcode);
21
21
  if (!roleCodes.length) {
22
22
  return { menu: [] };
23
23
  }
24
- const moduleCodes = await this.menuRepository.getAccessibleModules(roleCodes);
24
+ const moduleCodes = await this.menuRepository.getAccessibleModules(roleCodes, appcode);
25
25
  if (!moduleCodes.length) {
26
26
  return { menu: [] };
27
27
  }
28
- const menuItems = await this.menuRepository.getMenuItems(moduleCodes);
28
+ const menuItems = await this.menuRepository.getMenuItems(moduleCodes, appcode);
29
29
  const menuTree = this.buildMenuHierarchy(menuItems);
30
30
  return { menu: menuTree };
31
31
  }
@@ -1 +1 @@
1
- {"version":3,"file":"menu.service.js","sourceRoot":"","sources":["../../../../src/module/module/service/menu.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,mEAA+D;AAIxD,IAAM,WAAW,GAAjB,MAAM,WAAW;IACtB,YAA6B,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;IAAG,CAAC;IAK/D,KAAK,CAAC,WAAW,CAAC,MAAc;QAE9B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QACjE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YACtB,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QACtB,CAAC;QAGD,MAAM,WAAW,GACf,MAAM,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;QAC5D,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;YACxB,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QACtB,CAAC;QAGD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QAGtE,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAEpD,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAC5B,CAAC;IAKO,kBAAkB,CAAC,SAAqB;QAC9C,MAAM,OAAO,GAAG,IAAI,GAAG,EAAe,CAAC;QACvC,MAAM,QAAQ,GAAU,EAAE,CAAC;QAG3B,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACzB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QAGH,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACzB,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAElE,IAAI,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gBACxC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YAClE,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC5C,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF,CAAA;AAtDY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;qCAEkC,gCAAc;GADhD,WAAW,CAsDvB"}
1
+ {"version":3,"file":"menu.service.js","sourceRoot":"","sources":["../../../../src/module/module/service/menu.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,mEAA+D;AAIxD,IAAM,WAAW,GAAjB,MAAM,WAAW;IACtB,YAA6B,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;IAAG,CAAC;IAK/D,KAAK,CAAC,WAAW,CAAC,MAAc,EAAC,OAAc;QAE7C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,MAAM,EAAC,OAAO,CAAC,CAAC;QACzE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;YACtB,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QACtB,CAAC;QAGD,MAAM,WAAW,GACf,MAAM,IAAI,CAAC,cAAc,CAAC,oBAAoB,CAAC,SAAS,EAAC,OAAO,CAAC,CAAC;QACpE,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;YACxB,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;QACtB,CAAC;QAGD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,WAAW,EAAC,OAAO,CAAC,CAAC;QAG9E,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;QAEpD,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;IAC5B,CAAC;IAKO,kBAAkB,CAAC,SAAqB;QAC9C,MAAM,OAAO,GAAG,IAAI,GAAG,EAAe,CAAC;QACvC,MAAM,QAAQ,GAAU,EAAE,CAAC;QAG3B,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACzB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC;QACvD,CAAC,CAAC,CAAC;QAGH,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACzB,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAElE,IAAI,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;gBACxC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YAClE,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC5C,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF,CAAA;AAtDY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;qCAEkC,gCAAc;GADhD,WAAW,CAsDvB"}
@@ -1,7 +1,6 @@
1
1
  import { BaseEntity } from '../../meta/entity/base-entity.entity';
2
2
  export declare class Role extends BaseEntity {
3
3
  constructor();
4
- app_code: string;
5
4
  is_system: number;
6
5
  description: string;
7
6
  copy_from_role_id: number;
@@ -21,10 +21,6 @@ let Role = class Role extends base_entity_entity_1.BaseEntity {
21
21
  }
22
22
  };
23
23
  exports.Role = Role;
24
- __decorate([
25
- (0, typeorm_1.Column)({ length: 50, type: 'varchar', nullable: true }),
26
- __metadata("design:type", String)
27
- ], Role.prototype, "app_code", void 0);
28
24
  __decorate([
29
25
  (0, typeorm_1.Column)({ type: 'int', nullable: true }),
30
26
  __metadata("design:type", Number)
@@ -1 +1 @@
1
- {"version":3,"file":"role.entity.js","sourceRoot":"","sources":["../../../../src/module/user/entity/role.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6EAAkE;AAClE,uEAAoE;AACpE,qCAAyC;AACzC,yDAA4C;AAGrC,IAAM,IAAI,GAAV,MAAM,IAAK,SAAQ,+BAAU;IAClC;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,iCAAe,CAAC;IACrC,CAAC;CAaF,CAAA;AAjBY,oBAAI;AAOf;IADC,IAAA,gBAAM,EAAC,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sCACvC;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uCACtB;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCACrC;AAGpB;IADC,IAAA,2BAAO,GAAE;;+CACgB;eAhBf,IAAI;IADhB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;GACf,IAAI,CAiBhB"}
1
+ {"version":3,"file":"role.entity.js","sourceRoot":"","sources":["../../../../src/module/user/entity/role.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6EAAkE;AAClE,uEAAoE;AACpE,qCAAyC;AACzC,yDAA4C;AAGrC,IAAM,IAAI,GAAV,MAAM,IAAK,SAAQ,+BAAU;IAClC;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,iCAAe,CAAC;IACrC,CAAC;CAUF,CAAA;AAdY,oBAAI;AAOf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uCACtB;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;yCACrC;AAGpB;IADC,IAAA,2BAAO,GAAE;;+CACgB;eAbf,IAAI;IADhB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;;GACf,IAAI,CAchB"}