tnx-shared 5.3.253 → 5.3.255

package/fesm2015/tnx-shared.js

@@ -15490,6 +15490,7 @@ class DataFormBase extends ComponentBaseWithButton {
         this.setValidateForm = true;
         this.haveEntityMetadataAPI = true;
         this.isBaseModel = true;
+        this.autoGenerateId = true;
         this.__isFormView = false;
         const moduleConfigService = _injector.get(ModuleConfigService);
         this.environment = moduleConfigService.getConfig().environment;
@@ -15952,8 +15953,10 @@ class DataFormBase extends ComponentBaseWithButton {
     onAfterSave(response) {
     }
     _onAfterSave() {
-        if (!this.isCloseForm) {
-            this.model.data.id = this._commonService.guid();
+        var _a;
+        var _b;
+        if (!this.isCloseForm && this.autoGenerateId) {
+            (_a = (_b = this.model.data).id) !== null && _a !== void 0 ? _a : (_b.id = this._commonService.guid());
         }
     }
     onAfterGetDetail(data) {
@@ -16176,6 +16179,253 @@ DataFormBase.propDecorators = {
     onDataBinded: [{ type: Output }]
 };
 
+class CauHinhWorkflowService extends BaseService {
+    constructor(http, injector, _moduleConfigService) {
+        super(http, injector, `${_moduleConfigService.getConfig().environment.apiDomain.congviecEndpoint}/${_moduleConfigService.getConfig().environment.apiVersion}/CauHinhWorkflow`);
+        this._moduleConfigService = _moduleConfigService;
+        this.serviceCode = 'congviec';
+        this.entityName = 'CauHinhWorkflow';
+        this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.congviecEndpoint;
+    }
+}
+CauHinhWorkflowService.ɵprov = i0.ɵɵdefineInjectable({ factory: function CauHinhWorkflowService_Factory() { return new CauHinhWorkflowService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService)); }, token: CauHinhWorkflowService, providedIn: "root" });
+CauHinhWorkflowService.decorators = [
+    { type: Injectable, args: [{
+                providedIn: 'root'
+            },] }
+];
+CauHinhWorkflowService.ctorParameters = () => [
+    { type: HttpClient },
+    { type: Injector },
+    { type: ModuleConfigService }
+];
+
+class StateMachinesService extends BaseService {
+    constructor(http, injector, _moduleConfigService) {
+        super(http, injector, `${_moduleConfigService.getConfig().environment.apiDomain.workflowEndpoint}/${_moduleConfigService.getConfig().environment.apiVersion}/StateMachines`);
+        this._moduleConfigService = _moduleConfigService;
+        this.entityName = 'StateMachines';
+        this.serviceCode = 'workflow';
+        this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.workflowEndpoint;
+    }
+    changeState(itemWorkflowHistory) {
+        return this.defaultPost(`${this.serviceUri}/ChangeState`, itemWorkflowHistory);
+    }
+    rollback(rowData) {
+        return this.defaultPost(`${this.serviceUri}/Rollback/${rowData.__workflowCode}/${rowData.id}`, {});
+    }
+    getUserInProcessForm(workflowCode, stateCode, actionCode, itemId) {
+        return this.defaultPost(`${this.serviceUri}/GetUserInProcessForm/${workflowCode}/${stateCode}/${actionCode}/${itemId}`, {});
+    }
+}
+StateMachinesService.ɵprov = i0.ɵɵdefineInjectable({ factory: function StateMachinesService_Factory() { return new StateMachinesService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService)); }, token: StateMachinesService, providedIn: "root" });
+StateMachinesService.decorators = [
+    { type: Injectable, args: [{
+                providedIn: 'root'
+            },] }
+];
+StateMachinesService.ctorParameters = () => [
+    { type: HttpClient },
+    { type: Injector },
+    { type: ModuleConfigService }
+];
+
+class DmLoaiCongViecService extends BaseService {
+    constructor(http, injector, _moduleConfigService) {
+        super(http, injector, `${_moduleConfigService.getConfig().environment.apiDomain.congviecEndpoint}/${_moduleConfigService.getConfig().environment.apiVersion}/DM_LoaiCongViec`);
+        this._moduleConfigService = _moduleConfigService;
+        this.serviceCode = 'congviec';
+        this.entityName = 'DM_LoaiCongViec';
+        this.dicLoaiCongViec = {};
+        this.keyIdLoaiCongViecRoot = 'root';
+        this.getWorkflowSettingByIdLoaiCongViec = (idLoaiCongViec) => __awaiter(this, void 0, void 0, function* () {
+            if (!this.dicWorkflowByLoaiCongViec) {
+                yield this.getDatasourceWorkflowCongViec();
+            }
+            if (!idLoaiCongViec) {
+                return this.dicWorkflowByLoaiCongViec[this.keyIdLoaiCongViecRoot];
+            }
+            let result = this.dicWorkflowByLoaiCongViec[idLoaiCongViec];
+            if (result)
+                return result;
+            const idLoaiCongViecs = yield this.getIdLoaiCongViecs(idLoaiCongViec);
+            if (!Array.isArray(idLoaiCongViecs))
+                return null;
+            if (idLoaiCongViecs.length > 1) {
+                for (let i = idLoaiCongViecs.length - 2; i >= 0; i--) {
+                    result = this.dicWorkflowByLoaiCongViec[idLoaiCongViecs[i]];
+                    if (result)
+                        return result;
+                }
+            }
+            if (!result) {
+                result = this.dicWorkflowByLoaiCongViec[this.keyIdLoaiCongViecRoot];
+            }
+            return result;
+        });
+        this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.congviecEndpoint;
+    }
+    getDatasourceWorkflowCongViec() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.dicWorkflowByLoaiCongViec) {
+                this.dicWorkflowByLoaiCongViec = {};
+            }
+            const cauHinhWorkflowService = this._injector.get(CauHinhWorkflowService);
+            const cauHinhWorkflows = (yield cauHinhWorkflowService.getAll([], 'idLoaiCongViec,workflowCodes,workflowCode')).data;
+            const notifierService = this._injector.get(NotifierService);
+            if (cauHinhWorkflows == null) {
+                notifierService.showWarning('Dịch vụ workflow không phản hồi');
+                return [];
+            }
+            const workflowCodes = [];
+            cauHinhWorkflows.forEach(itemWorkflowSetting => {
+                if (itemWorkflowSetting.workflowCodes && !Array.isArray(itemWorkflowSetting.workflowCodes)) {
+                    itemWorkflowSetting.workflowCodes = itemWorkflowSetting.workflowCodes.split(',');
+                }
+                else {
+                    itemWorkflowSetting.workflowCodes = [];
+                }
+                itemWorkflowSetting.workflowCodes.forEach(workflowCode => {
+                    if (workflowCodes.indexOf(workflowCode) == -1) {
+                        workflowCodes.push(workflowCode);
+                    }
+                });
+            });
+            const stateMachinesService = this._injector.get(StateMachinesService);
+            const workflows = (yield stateMachinesService.getDataDropdownByFilter([
+                this.newFilter('code', Operator.in, workflowCodes)
+            ], new DropdownOptions({
+                valueField: 'code',
+                displayField: 'title',
+                fieldPlus: 'data'
+            })));
+            workflows.forEach(item => {
+                item.data = JSON.parse(item.data);
+                const stateMachineData = item.data;
+                stateMachineData.actions = {};
+                stateMachineData.machines.forEach(machine => {
+                    stateMachineData.actions[machine.code] = [];
+                    stateMachineData.connections.forEach(conn => {
+                        if (conn.source == machine.id) {
+                            stateMachineData.actions[machine.code].push(conn);
+                        }
+                    });
+                });
+            });
+            cauHinhWorkflows.forEach(itemWorkflowSetting => {
+                itemWorkflowSetting.workflows = workflows.filter(q => itemWorkflowSetting.workflowCodes.indexOf(q.code) > -1);
+                if (!itemWorkflowSetting.idLoaiCongViec) {
+                    this.dicWorkflowByLoaiCongViec[this.keyIdLoaiCongViecRoot] = itemWorkflowSetting;
+                }
+                else {
+                    this.dicWorkflowByLoaiCongViec[itemWorkflowSetting.idLoaiCongViec] = itemWorkflowSetting;
+                }
+            });
+            return workflows;
+        });
+    }
+    getIdLoaiCongViecs(idLoaiCongViec) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const notifierService = this._injector.get(NotifierService);
+            const itemLoaiCongViec = yield this.getItemLoaiCongViec(idLoaiCongViec);
+            if (itemLoaiCongViec == null) {
+                notifierService.showWarning('Loại công việc không tồn tại');
+                return null;
+            }
+            const idLoaiCongViecs = itemLoaiCongViec.idDuongDan.split(';').filter(q => !!q);
+            return idLoaiCongViecs;
+        });
+    }
+    getItemLoaiCongViec(idLoaiCongViec) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.dicLoaiCongViec[idLoaiCongViec]) {
+                this.dicLoaiCongViec[idLoaiCongViec] = (yield this.getDetail(idLoaiCongViec)).data;
+            }
+            return this.dicLoaiCongViec[idLoaiCongViec];
+        });
+    }
+}
+DmLoaiCongViecService.ɵprov = i0.ɵɵdefineInjectable({ factory: function DmLoaiCongViecService_Factory() { return new DmLoaiCongViecService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService)); }, token: DmLoaiCongViecService, providedIn: "root" });
+DmLoaiCongViecService.decorators = [
+    { type: Injectable, args: [{
+                providedIn: 'root'
+            },] }
+];
+DmLoaiCongViecService.ctorParameters = () => [
+    { type: HttpClient },
+    { type: Injector },
+    { type: ModuleConfigService }
+];
+
+class CongViecService extends BaseService {
+    constructor(http, injector, _moduleConfigService, _dmLoaiCongViecService) {
+        super(http, injector, `${_moduleConfigService.getConfig().environment.apiDomain.congviecEndpoint}/${_moduleConfigService.getConfig().environment.apiVersion}/CongViec_Chinh`);
+        this._dmLoaiCongViecService = _dmLoaiCongViecService;
+        this.serviceCode = 'congviec';
+        this.entityName = 'CongViec_Chinh';
+        this.objectName = 'công việc';
+        this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.congviecEndpoint;
+        this._moduleConfig = _moduleConfigService.getConfig();
+    }
+    adjustSettingWorkflowForCrudList(setting) {
+        this.useWorkflow = true;
+        setting.isWorkflowTree = true;
+        setting.baseService = this;
+        setting.displayField = (item) => item.ten;
+        setting.baseService.useWorkflow = true;
+        setting.workflowConfigAdvance = {
+            getWorkflowSetting: this.getWorkflowConfig.bind(this)
+        };
+    }
+    getWorkflowConfig(rowData) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return yield this._dmLoaiCongViecService.getWorkflowSettingByIdLoaiCongViec(rowData.idLoaiCongViec);
+        });
+    }
+    countByMenuState(data) {
+        return this.defaultPost(`${this.serviceUri}/CountByMenuState`, data);
+    }
+    getDicIdByMenuState(data, tuNgay, denNgay) {
+        return this.defaultPost(`${this.serviceUri}/GetDicIdByMenuState`, {
+            lstTrangThai: data,
+            tuNgay,
+            denNgay
+        });
+    }
+    updateBulkIdCha(model) {
+        const url = `${this.serviceUri}/UpdateBulkIdCha`;
+        return this.defaultPost(url, model);
+    }
+    deleteBulkCongViecCon(ids) {
+        const url = `${this.serviceUri}/DeleteBulkCongViecCon`;
+        return this.defaultPost(url, ids);
+    }
+    getDataDashboardCaNhan(inputData) {
+        const url = `${this.serviceUri}/GetDataDashboardCaNhan`;
+        return this.defaultPost(url, inputData);
+    }
+    getDataDashboardByDonVi(inputData) {
+        const url = `${this.serviceUri}/GetDataDashboardByDonVi`;
+        return this.defaultPost(url, inputData);
+    }
+    getListTasksDashboard(dataFilter) {
+        const url = `${this.serviceUri}/getListTasksDashboard`;
+        return this.defaultPost(url, dataFilter);
+    }
+}
+CongViecService.ɵprov = i0.ɵɵdefineInjectable({ factory: function CongViecService_Factory() { return new CongViecService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService), i0.ɵɵinject(DmLoaiCongViecService)); }, token: CongViecService, providedIn: "root" });
+CongViecService.decorators = [
+    { type: Injectable, args: [{
+                providedIn: 'root'
+            },] }
+];
+CongViecService.ctorParameters = () => [
+    { type: HttpClient },
+    { type: Injector },
+    { type: ModuleConfigService },
+    { type: DmLoaiCongViecService }
+];
+
 class SearchInfo {
     constructor(init) {
         this.fieldSearchText = [];
@@ -16443,752 +16693,160 @@ TnCustomScrollbarComponent.propDecorators = {
     scrollXReachStart: [{ type: Output }]
 };
 
-const EXCEL_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8';
-const EXCEL_EXTENSION = '.xlsx';
-class ExportService {
-    constructor(_http, _injector, _commonService, _moduleConfigService) {
-        this._http = _http;
-        this._injector = _injector;
-        this._commonService = _commonService;
-        this._moduleConfig = _moduleConfigService.getConfig();
-        this.environment = this._moduleConfig.environment;
-        this.serviceUri = `${this._moduleConfig.environment.apiDomain.templateEndpoint}/Export`;
-    }
-    objectToExcel(data, fileName, numOfHeaderRow) {
-        return this._http
-            .post(`${this.serviceUri}/ObjectToExcel?numOfHeaderRow=${numOfHeaderRow}`, data, { responseType: 'blob' })
-            .pipe(catchError((err) => this._commonService.handleError(err, this._injector)))
-            .subscribe(res => {
-            this.saveAsExcelFile(res, fileName);
-        });
-    }
-    saveAsExcelFile(buffer, fileName) {
-        const data = new Blob([buffer], {
-            type: EXCEL_TYPE
-        });
-        FileSaver__default.saveAs(data, fileName + '_' + new Date().getTime() + EXCEL_EXTENSION);
+class BasePermissionService extends BaseService {
+    constructor(http, injector, _moduleConfigService) {
+        super(http, injector, `${_moduleConfigService.getConfig().environment.apiDomain.authorizationEndpoint}/${_moduleConfigService.getConfig().environment.apiVersion}/BasePermission`);
+        this._moduleConfigService = _moduleConfigService;
+        this.entityName = 'BasePermission';
+        this.serviceCode = 'Authorization';
+        this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.authorizationEndpoint;
     }
-    saveSpreadSheet(buffer, fileName) {
-        const data = new Blob([buffer], {
-            type: EXCEL_TYPE
-        });
-        FileSaver__default.saveAs(data, new Date().getTime() + '_' + fileName);
+    getPermissionByCode(code) {
+        return this.defaultGet(`${this.serviceUri}/GetPermissionByCode?code=${code}`);
     }
 }
-ExportService.ɵprov = i0.ɵɵdefineInjectable({ factory: function ExportService_Factory() { return new ExportService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(CommonService), i0.ɵɵinject(ModuleConfigService)); }, token: ExportService, providedIn: "root" });
-ExportService.decorators = [
+BasePermissionService.ɵprov = i0.ɵɵdefineInjectable({ factory: function BasePermissionService_Factory() { return new BasePermissionService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService)); }, token: BasePermissionService, providedIn: "root" });
+BasePermissionService.decorators = [
     { type: Injectable, args: [{
                 providedIn: 'root'
             },] }
 ];
-ExportService.ctorParameters = () => [
+BasePermissionService.ctorParameters = () => [
     { type: HttpClient },
     { type: Injector },
-    { type: CommonService },
     { type: ModuleConfigService }
 ];
 
-class PhanQuyenModel {
-    constructor(init) {
-        this.addRoleIds = [];
-        this.removeRoleIds = [];
-        this.addPermissionIds = [];
-        this.removePermissionIds = [];
-        for (const key in init) {
-            this[key] = init[key];
+class CoCauToChucService extends BaseService {
+    constructor(http, injector, _moduleConfigService) {
+        super(http, injector, `${_moduleConfigService.getConfig().environment.apiDomain.userOrgEndpoint}/${_moduleConfigService.getConfig().environment.apiVersion}/organization`);
+        this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.userOrgEndpoint;
+        this.environment = _moduleConfigService.getConfig().environment;
+        if (this.isUseOldOrganization()) {
+            this.serviceUri = `${this.environment.apiDomain.organizationEndpoint}/organization`;
+        }
+    }
+    createDropdownTree(field = 'idDonViQuanLy') {
+        return new DropdownControlSchema({
+            field,
+            placeholder: 'Chọn đơn vị',
+            baseService: this,
+            sortField: 'idDuongDan',
+            fieldPlus: 'idDuongDan',
+            isTree: true,
+            fieldTree: 'idCha',
+            valueParentRoot: this._commonService.guidEmpty(),
+            // isServerLoad: true, Option này đang không chạy được trong case này
+            loadOnInit: true,
+            maxItemDisplay: 9999
+            // funcGetLabel: (item) => {
+            //     let level = item.idDuongDan.split(';').length - 2;
+            //     let prefix = '';
+            //     if (level < 2)
+            //         level = 1;
+            //     else
+            //         prefix = '|';
+            //     return `${prefix}${'---'.repeat(level - 1)} ${item.ten}`;
+            // }
+        });
+    }
+    isUseOldOrganization() {
+        const useOldOrganization = this.environment.useOldOrganization;
+        if (useOldOrganization) {
+            return true;
+        }
+        return false;
+    }
+    getByParentCode(organizationCode) {
+        let apiUrl = `${this.serviceUri}/GetByParentCode`;
+        if (organizationCode) {
+            apiUrl = `${apiUrl}?parentCode=${organizationCode}`;
+        }
+        return this.defaultGet(apiUrl);
+    }
+    getByCanBoId(canBoId) {
+        const apiUrl = `${this.serviceUri}/GetByCanBoId/${canBoId}`;
+        return this.defaultGet(apiUrl);
+    }
+    getCoCauToChucTreeTable(isIgnoreClientCache = false) {
+        const apiUrl = `${this.serviceUri}/GetTreeTable`;
+        if (isIgnoreClientCache) {
+            return this.getIgnoreClientCache(apiUrl);
         }
+        return this.defaultGet(apiUrl);
+    }
+    updateMaPhanCap(idCha) {
+        return this.defaultPost(`${this.serviceUri}/UpdateMaPhanCap/${idCha}`, {});
     }
 }
-class PermissionService extends BaseService {
-    constructor(http, injector, _moduleConfigService, _userService, _oauthService, _appContext) {
-        super(http, injector, `${_moduleConfigService.getConfig().environment.apiDomain.authorizationEndpoint}/${_moduleConfigService.getConfig().environment.apiVersion}/permission`);
+CoCauToChucService.ɵprov = i0.ɵɵdefineInjectable({ factory: function CoCauToChucService_Factory() { return new CoCauToChucService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService)); }, token: CoCauToChucService, providedIn: "root" });
+CoCauToChucService.decorators = [
+    { type: Injectable, args: [{
+                providedIn: 'root'
+            },] }
+];
+CoCauToChucService.ctorParameters = () => [
+    { type: HttpClient },
+    { type: Injector },
+    { type: ModuleConfigService }
+];
+
+class CanBo_HoSo_CoCauToChucService extends BaseService {
+    constructor(http, injector, _moduleConfigService) {
+        super(http, injector, `${_moduleConfigService.getConfig().environment.apiDomain.canboEndpoint}/${_moduleConfigService.getConfig().environment.apiVersion}/CanBo_HoSo_CoCauToChuc`);
         this._moduleConfigService = _moduleConfigService;
-        this._userService = _userService;
-        this._oauthService = _oauthService;
-        this._appContext = _appContext;
-        this.storage = sessionStorage;
-        this.ignoreAdmin = false;
-        this.delayCheckPermissions = [];
-        this.appCode = null;
-        this._config = this._moduleConfigService.getConfig();
-        this.endPoint = this._config.environment.apiDomain.authorizationEndpoint;
-        this.ignoreAdmin = this._config.environment.isIgnoreAdmin;
-        this.appCode = this._config.appCode;
+        this.entityName = 'CanBo_HoSo_CoCauToChuc';
+        this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.canboEndpoint;
     }
-    clearPermissionCacheAll() {
-        var _a, _b, _c;
-        const lstAppCodes = (_c = (_b = (_a = this._config.environment.appMetadata) === null || _a === void 0 ? void 0 : _a.appSwitcher) === null || _b === void 0 ? void 0 : _b.map(app => app.code)) !== null && _c !== void 0 ? _c : [];
-        const lstApiEndpoint = [];
-        const apiDomain = this._config.environment.apiDomain;
-        for (const domainName in apiDomain) {
-            if (domainName.startsWith('-') || domainName.startsWith('1') || domainName == 'gateway')
-                continue;
-            const realDomainName = domainName.split('Endpoint') ? domainName.split('Endpoint')[0] : domainName;
-            lstApiEndpoint.push(realDomainName.toUpperCase());
-        }
-        return this.clearPermissionCache([...lstAppCodes, ...lstApiEndpoint]);
+    sapNhapCoCauToChuc(model) {
+        return this.defaultPost(`${this.serviceUri}/SapNhapCoCauToChuc`, model);
     }
-    clearPermissionCache(lstModule) {
-        const url = `${this.serviceUri}/ClearPermissionCache`;
-        return this.defaultPost(url, lstModule);
+    getIdsDonViByCanBoLogin() {
+        return this.defaultGet(`${this.serviceUri}/GetIdsDonViByCanBoLogin`);
     }
-    getCurrentUserPermission() {
-        const url = `${this.serviceUri}/GetCurrentUserPermission`;
-        return this.defaultGet(url);
+    getDonViChucVuCapCaoNhatByIdsCanBo(idsCanBo = []) {
+        return this.defaultPost(`${this.serviceUri}/GetDonViChucVuCapCaoNhatByIdsCanBo`, idsCanBo);
     }
-    getAllBasePermission(userId) {
-        var _a, _b, _c;
+    unshiftColumnKhoaVienBoMon(modelSchemas, cols) {
+        modelSchemas.unshift(...[new ModelSchema({
+                field: 'donVi',
+                name: 'Khoa viện/ đơn vị',
+                fullName: 'Khoa viện/ đơn vị',
+                description: 'Khoa viện/ đơn vị'
+            }),
+            new ModelSchema({
+                field: 'boMon',
+                name: 'Bộ môn/ văn phòng khoa',
+                fullName: 'Bộ môn/ văn phòng khoa',
+                description: 'Bộ môn/ văn phòng khoa'
+            })]);
+        cols.unshift(...[new ColumnSchemaBase({
+                field: 'donVi',
+                dataType: 'html',
+                width: '200px',
+                allowFilter: false,
+                sort: false
+            }),
+            new ColumnSchemaBase({
+                field: 'boMon',
+                dataType: 'html',
+                width: '200px',
+                allowFilter: false,
+                sort: false
+            })]);
+    }
+    getsDonViTheoCap(dataSource = []) {
+        return this.defaultPost(`${this.serviceUri}/GetsDonViTheoCap`, dataSource);
+    }
+    getKhoaVienBoMonAfterGetData(dataSource) {
         return __awaiter(this, void 0, void 0, function* () {
-            const url = `${this.serviceUri}/GetAllBasePermission`;
-            // return sớm vì đây là trường hợp lấy permission theo Id của User
-            // ko set local storage vì sẽ làm hỏng quyền của người dùng hiện tại
-            if (userId && userId != '' && userId != this._commonService.guidEmpty()) {
-                return this.defaultGet(url + `?userId=${userId}`);
-            }
-            if (isDevMode()) {
-                return;
-            }
-            const user = this._userService.getCurrentUser();
-            if (user
-                && (user.issuperuser && user.issuperuser.toLowerCase() == 'true')
-                || (user.isadmin && user.isadmin.toLowerCase() == 'true' && !this.ignoreAdmin)) {
-                return;
-            }
-            const res = yield this.defaultGet(url);
-            const lstAppCodes = (_c = (_b = (_a = this._config.environment.appMetadata) === null || _a === void 0 ? void 0 : _a.appSwitcher) === null || _b === void 0 ? void 0 : _b.map(app => app.code)) !== null && _c !== void 0 ? _c : [];
-            // Nếu Có error lấy dữ liệu quyền tổng hợp thì quay về lấy dữ liệu quyền dựa vào từng module
-            if (!res || !res.success || res.data == null) {
-                const promiseArr = [];
-                for (const code of lstAppCodes) {
-                    promiseArr.push(this.getServicePermission(code, true));
-                }
-                yield Promise.all(promiseArr);
-                return;
-            }
-            // Set local storage cho permission của người dùng
-            for (const service of lstAppCodes) {
-                let permissions = [];
-                const serviceCode = service.toUpperCase();
-                for (const key in res.data) {
-                    if (key.toUpperCase() != serviceCode) {
-                        continue;
-                    }
-                    permissions = res.data[key];
-                    break;
-                }
-                const key = `AUTHORIZATION.${serviceCode}`;
-                const storageItem = this.storage.getItem(key);
-                if (storageItem != null) {
-                    this.storage.removeItem(key);
-                }
-                this.storage.setItem(key, JSON.stringify(permissions));
-            }
-        });
-    }
-    /**
-     * Truyền vào danh sách permision cần check
-     * @param lstPermissionCode những perrmision code cần check => nên dùng trong trường hợp check các button trong code
-     * @returns trả ra các perrmisionCode có quyền
-     */
-    getPermissionAuthorized(lstPermissionCode) {
-        return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-            const user = (yield this._userService.getCurrentUser());
-            if (user && user.issuperuser.toLowerCase() == 'true') {
-                resolve(lstPermissionCode);
-                return;
-            }
-            if (user && user.isadmin.toLowerCase() == 'true' && !this.ignoreAdmin) {
-                resolve(lstPermissionCode);
-                return;
-            }
-            const result = [];
-            for (const item of lstPermissionCode) {
-                if (yield this.isAuthorizedPermission(item)) {
-                    result.push(item);
-                }
-            }
-            resolve(result);
-        }));
-    }
-    isAuthorizedPermission(permission) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let retryCount = 0;
-            while (!this._oauthService.hasValidAccessToken()) {
-                yield this._commonService.delay(100);
-                retryCount++;
-                if (retryCount > 50) {
-                    break;
-                }
-            }
-            return yield this.checkPermission(this.appCode, permission);
-        });
-    }
-    isAuthorized(service, permission, checForMenu = false) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.root = this._appContext.getRootContext();
-            let retryCount = 0;
-            while (!this._oauthService.hasValidAccessToken()) {
-                yield this._commonService.delay(100);
-                retryCount++;
-                if (retryCount > 50) {
-                    break;
-                }
-            }
-            return yield this.checkPermission(service, permission, checForMenu);
-        });
-    }
-    checkPermission(service, permissionToCheck, checkForMenu = false) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                const user = this._userService.getCurrentUser();
-                const valueIsDevMode = true;
-                if (isDevMode() && valueIsDevMode) {
-                    return true;
-                }
-                if (user && user.issuperuser && user.issuperuser.toLowerCase() == 'true' && valueIsDevMode) {
-                    return true;
-                }
-                if (user && user.isadmin && user.isadmin.toLowerCase() == 'true' && !this.ignoreAdmin && valueIsDevMode) {
-                    return true;
-                }
-                const userPermissions = yield this.getServicePermission(service);
-                if (userPermissions && userPermissions.length > 0) {
-                    return checkForMenu
-                        ? userPermissions.includes(permissionToCheck)
-                        : this._checkPermission(userPermissions, permissionToCheck);
-                }
-                else {
-                    // console.log(`Không có quyền với phân hệ [${service}]`);
-                    return false;
-                }
-            }
-            catch (_a) {
-                return false;
-            }
-        });
-    }
-    _checkPermission(userPermissions, permissionToCheck) {
-        let isAuthorized = false;
-        // check permission của người dùng
-        // duyệt qua từng permission của người dùng
-        for (const userPermission of userPermissions) {
-            // biến để break khỏi vòng khi người dùng được authorized
-            let breakOuterLoop = false;
-            // pointer permission của người dùng
-            let userPermissionPointer = 0;
-            // pointer permission đang check
-            let permissionToCheckPointer = 0;
-            // mark co the check query param
-            let aboutToCheckQueryParam = false;
-            // check từng char của 2 mảng
-            for (; permissionToCheckPointer < permissionToCheck.length;) {
-                // nếu char là ký tự bắt đầu template => tịnh tiến pointer của 2 mảng
-                let needRecheck = false;
-                if (userPermission[userPermissionPointer] == '{') {
-                    // cho đến khi tìm được ký tự '/' tiếp theo thì dừng lại
-                    for (; userPermissionPointer < userPermission.length; userPermissionPointer++) {
-                        if (userPermissionPointer == userPermission.length - 1) {
-                            break;
-                        }
-                        if (userPermission[userPermissionPointer] != '}') {
-                            continue;
-                        }
-                        if (userPermission[userPermissionPointer] === '?') {
-                            aboutToCheckQueryParam = true;
-                        }
-                        ++userPermissionPointer; // tiến tiến đến ký tự sau kết thúc template
-                        // check trường hợp trường hợp chuỗi template có dạng "{template}acsekjf"
-                        // => cần check các ký tự sau template và trước ký tự '/'
-                        if (userPermission[userPermissionPointer] != '/' && (aboutToCheckQueryParam && userPermission[userPermissionPointer] != '&')) {
-                            needRecheck = true;
-                            for (; userPermissionPointer < userPermission.length; userPermissionPointer++) {
-                                if (userPermissionPointer == userPermission.length - 1) {
-                                    break;
-                                }
-                                if (userPermission[userPermissionPointer] != '/') {
-                                    continue;
-                                }
-                                break;
-                            }
-                        }
-                        break;
-                    }
-                    for (; permissionToCheckPointer < permissionToCheck.length; permissionToCheckPointer++) {
-                        if (permissionToCheckPointer == permissionToCheck.length - 1) {
-                            break;
-                        }
-                        if (permissionToCheck[permissionToCheckPointer] == '/' || (aboutToCheckQueryParam && permissionToCheck[permissionToCheckPointer] == '&')) {
-                            break;
-                        }
-                    }
-                }
-                let breakInnerLoop = false;
-                if (needRecheck) {
-                    // check lại cho trường hợp chuỗi template có dạng "{template}acslekfj"
-                    // duyệt ngược lại cho đến khi gặp ký tự kết thúc template
-                    let tempUserPointer = userPermissionPointer;
-                    let tempToCheckPointer = permissionToCheckPointer;
-                    while (userPermission[tempUserPointer] != '}') {
-                        // ký tự khác nhau => break khỏi vòng kiểm tra trong
-                        if (userPermission[tempUserPointer].toLowerCase() != permissionToCheck[tempToCheckPointer].toLowerCase()) {
-                            breakInnerLoop = true;
-                            break;
-                        }
-                        tempUserPointer--;
-                        tempToCheckPointer--;
-                    }
-                }
-                if (breakInnerLoop) {
-                    break;
-                }
-                const userChar = userPermission[userPermissionPointer].toLowerCase();
-                const toCheckChar = permissionToCheck[permissionToCheckPointer].toLowerCase();
-                // nếu userPermission đang ở index cuối
-                if (userPermissionPointer == userPermission.length - 1) {
-                    // check char cuối của 2 mảng (trừ khi là ký tự kết thúc template)
-                    // và cũng phải là char cuối của mảng permission cần check
-                    // => người dùng authorized và break khỏi vòng lặp ngoài cùng
-                    if ((userChar == '}' || userChar == toCheckChar)
-                        && permissionToCheckPointer == permissionToCheck.length - 1) {
-                        breakOuterLoop = true;
-                        isAuthorized = true;
-                    }
-                    break;
-                }
-                // check char có giống nhau không, không giống thì break khỏi vòng check
-                if (userChar != toCheckChar) {
-                    break;
-                }
-                // nếu char giống nhau thì tiếp tục vòng lăp
-                permissionToCheckPointer++;
-                userPermissionPointer++;
-            }
-            if (breakOuterLoop) {
-                break;
-            }
-        }
-        return isAuthorized;
-    }
-    _checkPermissionOld(userPermissions, permissionToCheck) {
-        let isAuthorized = false;
-        // check quyền theo cách cũ nếu trường họp là phân quyền module
-        if (permissionToCheck.includes('MODULE')) {
-            return userPermissions.includes(permissionToCheck);
-        }
-        for (const userPermission of userPermissions) {
-            // Cắt chuỗi permission thành mảng để xem mỗi fragement có khớp nhau không
-            const userPermissionFragments = userPermission.split('/');
-            const permissionFragments = permissionToCheck.split('/');
-            // Mảng khác độ dài thì thoát sớm
-            if (userPermissionFragments.length != permissionFragments.length) {
-                continue;
-            }
-            // biến flag ra hiệu người dùng authorized và out vòng
-            let breakLoop = false;
-            // nếu tất cả phần tử khớp nhau => permission này trùng và người dùng được authorized
-            for (let index = 0; index < permissionFragments.length; index++) {
-                const userFragement = userPermissionFragments[index];
-                const permissionFragment = permissionFragments[index];
-                // skip qua các phần tử có ký tự bắt đầu là '{'
-                if (userFragement[0] == '{') {
-                    if (index == permissionFragments.length - 1) {
-                        isAuthorized = true;
-                        breakLoop = true;
-                    }
-                    continue;
-                }
-                if (userFragement.toLowerCase() != permissionFragment.toLowerCase()) {
-                    break;
-                }
-                if (index == permissionFragments.length - 1) {
-                    isAuthorized = true;
-                    breakLoop = true;
-                }
-            }
-            if (breakLoop) {
-                break;
-            }
-        }
-        return isAuthorized;
-    }
-    isAuthorizedByPermissions(permissions, operator = 'OR', ignoreAdmin = false) {
-        return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-            const user = (yield this._userService.getCurrentUser());
-            if (user && user.issuperuser.toLowerCase() == 'true') {
-                resolve(true);
-                return;
-            }
-            if (user && user.isadmin.toLowerCase() == 'true' && !this.ignoreAdmin) {
-                resolve(true);
-                return;
-            }
-            let isAuthorized = true;
-            if (operator.toUpperCase() == 'OR') {
-                isAuthorized = false;
-            }
-            permissions.forEach(item => {
-                this.getServicePermission(item.service).then(permissionResult => {
-                    if (operator.toUpperCase() == 'OR') {
-                        if (permissionResult.includes(item.permission)) {
-                            isAuthorized = true;
-                            return;
-                        }
-                    }
-                    else {
-                        if (!permissionResult.includes(item.permission)) {
-                            isAuthorized = false;
-                            return;
-                        }
-                    }
-                }, error => {
-                    reject(false);
-                });
-            });
-            resolve(isAuthorized);
-        }));
-    }
-    getServicePermission(service, overrideLocalStorage = false) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const key = `AUTHORIZATION.${service.toUpperCase()}`;
-            if (!overrideLocalStorage) {
-                const storageItem = this.storage.getItem(key);
-                if (storageItem && storageItem !== 'null') {
-                    const result = JSON.parse(storageItem);
-                    return result;
-                }
-            }
-            const url = `${this.serviceUri}/GetPermissionsByService?service=${service}`;
-            const response = yield this.defaultGet(url);
-            if (!response || !response.success) {
-                return [];
-            }
-            if (overrideLocalStorage) {
-                this.storage.removeItem(key);
-            }
-            this.storage.setItem(key, JSON.stringify(response.data));
-            return response.data;
-        });
-    }
-    getPermissionIdsByModule(moduleCode, userId) {
-        const url = `${this.serviceUri}/GetPermissionIdsByModule/${moduleCode}/${userId}`;
-        return this.defaultGet(url);
-    }
-    phanQuyenNguoiDung(model) {
-        const url = `${this.serviceUri}/PhanQuyenNguoiDung`;
-        return this.defaultPost(url, model);
-    }
-}
-PermissionService.ɵprov = i0.ɵɵdefineInjectable({ factory: function PermissionService_Factory() { return new PermissionService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService), i0.ɵɵinject(UserService), i0.ɵɵinject(i4.OAuthService), i0.ɵɵinject(ApplicationContextService)); }, token: PermissionService, providedIn: "root" });
-PermissionService.decorators = [
-    { type: Injectable, args: [{
-                providedIn: 'root'
-            },] }
-];
-PermissionService.ctorParameters = () => [
-    { type: HttpClient },
-    { type: Injector },
-    { type: ModuleConfigService },
-    { type: UserService },
-    { type: OAuthService },
-    { type: ApplicationContextService }
-];
-
-var sort_by;
-(function () {
-    const defaultCompareFunc = function (a, b) {
-        if (a == b)
-            return 0;
-        return a < b ? -1 : 1;
-    };
-    const getCompareFunc = function (primer, reverse) {
-        const defaultCompare = defaultCompareFunc;
-        let compare = defaultCompareFunc;
-        if (primer) {
-            compare = function (a, b) {
-                return defaultCompare(primer(a), primer(b));
-            };
-        }
-        if (reverse) {
-            return function (a, b) {
-                return -1 * compare(a, b);
-            };
-        }
-        return compare;
-    };
-    sort_by = function (...args) {
-        const fields = [], n_fields = args.length;
-        let field, name, cmp;
-        // preprocess sorting options
-        for (let i = 0; i < n_fields; i++) {
-            field = args[i];
-            if (typeof field === 'string') {
-                name = field;
-                cmp = defaultCompareFunc;
-            }
-            else {
-                name = field.name;
-                cmp = getCompareFunc(field.primer, field.reverse);
-            }
-            fields.push({
-                name: name,
-                cmp: cmp
-            });
-        }
-        // final comparison function
-        return function (A, B) {
-            let name, result;
-            for (let i = 0; i < n_fields; i++) {
-                result = 0;
-                field = fields[i];
-                name = field.name;
-                result = field.cmp(A[name], B[name]);
-                if (result !== 0)
-                    break;
-            }
-            return result;
-        };
-    };
-}());
-// multipleSort('idTinhThanh', 'idQuanHuyen')
-// multipleSort({name: 'idTinhThanh', reverse: true}, 'idQuanHuyen')
-// multipleSort({name: 'soThuTu', primer: parseInt}, 'idQuanHuyen') // parseInt là function
-const multipleSort = sort_by;
-
-const moduleMap = {};
-function loadRemoteEntry(remoteEntry) {
-    return new Promise((resolve, reject) => {
-        if (moduleMap[remoteEntry]) {
-            resolve();
-            return;
-        }
-        const script = document.createElement('script');
-        script.src = remoteEntry;
-        script.onerror = reject;
-        script.onload = () => {
-            moduleMap[remoteEntry] = true;
-            resolve(); // window is the global namespace
-        };
-        document.body.append(script);
-    });
-}
-function lookupExposedModule(remoteName, exposedModule) {
-    return __awaiter(this, void 0, void 0, function* () {
-        // Initializes the share scope. This fills it with known provided modules from this build and all remotes
-        yield __webpack_init_sharing__('default');
-        const container = window[remoteName]; // or get the container somewhere else
-        // Initialize the container, it may provide shared modules
-        yield container.init(__webpack_share_scopes__.default);
-        const factory = yield container.get(exposedModule);
-        const Module = factory();
-        return Module;
-    });
-}
-function loadRemoteModule(options) {
-    return __awaiter(this, void 0, void 0, function* () {
-        yield loadRemoteEntry(options.remoteEntry);
-        return yield lookupExposedModule(options.remoteName, options.exposedModule);
-    });
-}
-function loadRemotePageModule(remoteName, module, environment) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let remoteEntry = `${environment.clientDomain.appDomain}/${remoteName}/remoteEntry.js`;
-        if (!environment.production) {
-            remoteEntry = `${environment.clientDomain[remoteName]}/remoteEntry.js`;
-        }
-        const options = {
-            remoteName: remoteName,
-            remoteEntry: remoteEntry,
-            exposedModule: module,
-        };
-        return yield loadRemoteModule(options);
-    });
-}
-
-class FederationService {
-    constructor(resolver, _moduleConfigService) {
-        this.resolver = resolver;
-        this._moduleConfigService = _moduleConfigService;
-        this.environment = _moduleConfigService.getConfig().environment;
-    }
-    loadRemoteComponent(remoteName, componentName, viewContainerRef) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let remoteEntry = `${this.environment.clientDomain.appDomain}/${remoteName}/remoteEntry.js`;
-            if (!this.environment.production) {
-                remoteEntry = `${this.environment.clientDomain[remoteName]}/remoteEntry.js`;
-            }
-            const options = {
-                remoteName: remoteName,
-                remoteEntry: remoteEntry,
-                exposedModule: componentName,
-            };
-            const component = yield loadRemoteModule(options);
-            const componentFactory = this.resolver.resolveComponentFactory(component[componentName]);
-            const viewContainer = viewContainerRef.viewContainerRef;
-            viewContainer.clear();
-            const compRef = viewContainer.createComponent(componentFactory);
-            return compRef;
-        });
-    }
-    loadRemoteNewComponent(remoteName, componentName, viewContainerRef) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let remoteEntry = `${this.environment.clientDomain.appDomain}/${remoteName}/remoteEntry.js`;
-            if (!this.environment.production) {
-                remoteEntry = `${this.environment.clientDomain[remoteName]}/remoteEntry.js`;
-            }
-            const options = {
-                remoteName: remoteName,
-                remoteEntry: remoteEntry,
-                exposedModule: componentName,
-            };
-            const component = yield loadRemoteModule(options);
-            const componentFactory = this.resolver.resolveComponentFactory(component[componentName]);
-            viewContainerRef.clear();
-            const compRef = viewContainerRef.createComponent(componentFactory);
-            return compRef;
-        });
-    }
-}
-FederationService.ɵprov = i0.ɵɵdefineInjectable({ factory: function FederationService_Factory() { return new FederationService(i0.ɵɵinject(i0.ComponentFactoryResolver), i0.ɵɵinject(ModuleConfigService)); }, token: FederationService, providedIn: "root" });
-FederationService.decorators = [
-    { type: Injectable, args: [{
-                providedIn: 'root'
-            },] }
-];
-FederationService.ctorParameters = () => [
-    { type: ComponentFactoryResolver },
-    { type: ModuleConfigService }
-];
-
-class CoCauToChucService extends BaseService {
-    constructor(http, injector, _moduleConfigService) {
-        super(http, injector, `${_moduleConfigService.getConfig().environment.apiDomain.userOrgEndpoint}/${_moduleConfigService.getConfig().environment.apiVersion}/organization`);
-        this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.userOrgEndpoint;
-        this.environment = _moduleConfigService.getConfig().environment;
-        if (this.isUseOldOrganization()) {
-            this.serviceUri = `${this.environment.apiDomain.organizationEndpoint}/organization`;
-        }
-    }
-    createDropdownTree(field = 'idDonViQuanLy') {
-        return new DropdownControlSchema({
-            field,
-            placeholder: 'Chọn đơn vị',
-            baseService: this,
-            sortField: 'idDuongDan',
-            fieldPlus: 'idDuongDan',
-            isTree: true,
-            fieldTree: 'idCha',
-            valueParentRoot: this._commonService.guidEmpty(),
-            // isServerLoad: true, Option này đang không chạy được trong case này
-            loadOnInit: true,
-            maxItemDisplay: 9999
-            // funcGetLabel: (item) => {
-            //     let level = item.idDuongDan.split(';').length - 2;
-            //     let prefix = '';
-            //     if (level < 2)
-            //         level = 1;
-            //     else
-            //         prefix = '|';
-            //     return `${prefix}${'---'.repeat(level - 1)} ${item.ten}`;
-            // }
-        });
-    }
-    isUseOldOrganization() {
-        const useOldOrganization = this.environment.useOldOrganization;
-        if (useOldOrganization) {
-            return true;
-        }
-        return false;
-    }
-    getByParentCode(organizationCode) {
-        let apiUrl = `${this.serviceUri}/GetByParentCode`;
-        if (organizationCode) {
-            apiUrl = `${apiUrl}?parentCode=${organizationCode}`;
-        }
-        return this.defaultGet(apiUrl);
-    }
-    getByCanBoId(canBoId) {
-        const apiUrl = `${this.serviceUri}/GetByCanBoId/${canBoId}`;
-        return this.defaultGet(apiUrl);
-    }
-    getCoCauToChucTreeTable(isIgnoreClientCache = false) {
-        const apiUrl = `${this.serviceUri}/GetTreeTable`;
-        if (isIgnoreClientCache) {
-            return this.getIgnoreClientCache(apiUrl);
-        }
-        return this.defaultGet(apiUrl);
-    }
-    updateMaPhanCap(idCha) {
-        return this.defaultPost(`${this.serviceUri}/UpdateMaPhanCap/${idCha}`, {});
-    }
-}
-CoCauToChucService.ɵprov = i0.ɵɵdefineInjectable({ factory: function CoCauToChucService_Factory() { return new CoCauToChucService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService)); }, token: CoCauToChucService, providedIn: "root" });
-CoCauToChucService.decorators = [
-    { type: Injectable, args: [{
-                providedIn: 'root'
-            },] }
-];
-CoCauToChucService.ctorParameters = () => [
-    { type: HttpClient },
-    { type: Injector },
-    { type: ModuleConfigService }
-];
-
-class CanBo_HoSo_CoCauToChucService extends BaseService {
-    constructor(http, injector, _moduleConfigService) {
-        super(http, injector, `${_moduleConfigService.getConfig().environment.apiDomain.canboEndpoint}/${_moduleConfigService.getConfig().environment.apiVersion}/CanBo_HoSo_CoCauToChuc`);
-        this._moduleConfigService = _moduleConfigService;
-        this.entityName = 'CanBo_HoSo_CoCauToChuc';
-        this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.canboEndpoint;
-    }
-    sapNhapCoCauToChuc(model) {
-        return this.defaultPost(`${this.serviceUri}/SapNhapCoCauToChuc`, model);
-    }
-    getIdsDonViByCanBoLogin() {
-        return this.defaultGet(`${this.serviceUri}/GetIdsDonViByCanBoLogin`);
-    }
-    getDonViChucVuCapCaoNhatByIdsCanBo(idsCanBo = []) {
-        return this.defaultPost(`${this.serviceUri}/GetDonViChucVuCapCaoNhatByIdsCanBo`, idsCanBo);
-    }
-    unshiftColumnKhoaVienBoMon(modelSchemas, cols) {
-        modelSchemas.unshift(...[new ModelSchema({
-                field: 'donVi',
-                name: 'Khoa viện/ đơn vị',
-                fullName: 'Khoa viện/ đơn vị',
-                description: 'Khoa viện/ đơn vị'
-            }),
-            new ModelSchema({
-                field: 'boMon',
-                name: 'Bộ môn/ văn phòng khoa',
-                fullName: 'Bộ môn/ văn phòng khoa',
-                description: 'Bộ môn/ văn phòng khoa'
-            })]);
-        cols.unshift(...[new ColumnSchemaBase({
-                field: 'donVi',
-                dataType: 'html',
-                width: '200px',
-                allowFilter: false,
-                sort: false
-            }),
-            new ColumnSchemaBase({
-                field: 'boMon',
-                dataType: 'html',
-                width: '200px',
-                allowFilter: false,
-                sort: false
-            })]);
-    }
-    getsDonViTheoCap(dataSource = []) {
-        return this.defaultPost(`${this.serviceUri}/GetsDonViTheoCap`, dataSource);
-    }
-    getKhoaVienBoMonAfterGetData(dataSource) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const items = dataSource.map(x => ({ idCanBo: x.idCanBo }));
-            const lstDonViTheoCap = (yield this.getsDonViTheoCap(items)).data;
-            if (lstDonViTheoCap.length == dataSource.length) {
-                dataSource.forEach((element, index) => {
-                    element.donVi = lstDonViTheoCap[index].lstDonViCap2.join('<br/>');
-                    element.boMon = lstDonViTheoCap[index].lstDonViCap3.join('<br/>');
-                });
+            const items = dataSource.map(x => ({ idCanBo: x.idCanBo }));
+            const lstDonViTheoCap = (yield this.getsDonViTheoCap(items)).data;
+            if (lstDonViTheoCap.length == dataSource.length) {
+                dataSource.forEach((element, index) => {
+                    element.donVi = lstDonViTheoCap[index].lstDonViCap2.join('<br/>');
+                    element.boMon = lstDonViTheoCap[index].lstDonViCap3.join('<br/>');
+                });
             }
         });
     }
@@ -17906,300 +17564,662 @@ CanBoHoSoService.ctorParameters = () => [
     { type: CrudService }
 ];
 
-class StateMachinesService extends BaseService {
+class EntityWorkflowHistoryService extends BaseService {
     constructor(http, injector, _moduleConfigService) {
-        super(http, injector, `${_moduleConfigService.getConfig().environment.apiDomain.workflowEndpoint}/${_moduleConfigService.getConfig().environment.apiVersion}/StateMachines`);
-        this._moduleConfigService = _moduleConfigService;
-        this.entityName = 'StateMachines';
-        this.serviceCode = 'workflow';
-        this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.workflowEndpoint;
+        super(http, injector, `${_moduleConfigService.getConfig().environment.apiDomain.userOrgEndpoint}/${_moduleConfigService.getConfig().environment.apiVersion}/EntityWorkflowHistory`);
+        this.entityName = 'EntityWorkflowHistory';
+        this.serviceManagers = {};
+        this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.userOrgEndpoint;
+        this._moduleConfig = _moduleConfigService.getConfig();
     }
-    changeState(itemWorkflowHistory) {
-        return this.defaultPost(`${this.serviceUri}/ChangeState`, itemWorkflowHistory);
+    registerService(entityName, service) {
+        this.serviceManagers[entityName] = service;
     }
-    rollback(rowData) {
-        return this.defaultPost(`${this.serviceUri}/Rollback/${rowData.__workflowCode}/${rowData.id}`, {});
+    getEndpointByService(service) {
+        return `${service.endPoint}/${this._moduleConfig.environment.apiVersion}`;
     }
-    getUserInProcessForm(workflowCode, stateCode, actionCode, itemId) {
-        return this.defaultPost(`${this.serviceUri}/GetUserInProcessForm/${workflowCode}/${stateCode}/${actionCode}/${itemId}`, {});
+    setCurrentServiceUri(tableName) {
+        const service = this.serviceManagers[tableName];
+        if (service == undefined) {
+            (this._injector.get(NotifierService)).showWarning('Bạn chưa đăng ký base service cho entity workflow history');
+        }
+        this.serviceUri = `${this.getEndpointByService(service)}/EntityWorkflowHistory`;
+    }
+    getLastHistory(tableName, filters = []) {
+        const service = this.serviceManagers[tableName];
+        if (service == undefined) {
+            (this._injector.get(NotifierService)).showWarning('Bạn chưa đăng ký base service cho entity workflow history');
+        }
+        const url = `${this.getEndpointByService(service)}/EntityWorkflowHistory/GetLastByFilter`;
+        const gridInfo = {
+            pageInfo: {
+                page: 1,
+                pageSize: 1
+            },
+            filters,
+            sorts: [
+                new Sort({ field: 'created', dir: 1 })
+            ]
+        };
+        return this.defaultPost(url, gridInfo);
+    }
+}
+EntityWorkflowHistoryService.ɵprov = i0.ɵɵdefineInjectable({ factory: function EntityWorkflowHistoryService_Factory() { return new EntityWorkflowHistoryService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService)); }, token: EntityWorkflowHistoryService, providedIn: "root" });
+EntityWorkflowHistoryService.decorators = [
+    { type: Injectable, args: [{
+                providedIn: 'root'
+            },] }
+];
+EntityWorkflowHistoryService.ctorParameters = () => [
+    { type: HttpClient },
+    { type: Injector },
+    { type: ModuleConfigService }
+];
+
+const EXCEL_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=UTF-8';
+const EXCEL_EXTENSION = '.xlsx';
+class ExportService {
+    constructor(_http, _injector, _commonService, _moduleConfigService) {
+        this._http = _http;
+        this._injector = _injector;
+        this._commonService = _commonService;
+        this._moduleConfig = _moduleConfigService.getConfig();
+        this.environment = this._moduleConfig.environment;
+        this.serviceUri = `${this._moduleConfig.environment.apiDomain.templateEndpoint}/Export`;
+    }
+    objectToExcel(data, fileName, numOfHeaderRow) {
+        return this._http
+            .post(`${this.serviceUri}/ObjectToExcel?numOfHeaderRow=${numOfHeaderRow}`, data, { responseType: 'blob' })
+            .pipe(catchError((err) => this._commonService.handleError(err, this._injector)))
+            .subscribe(res => {
+            this.saveAsExcelFile(res, fileName);
+        });
+    }
+    saveAsExcelFile(buffer, fileName) {
+        const data = new Blob([buffer], {
+            type: EXCEL_TYPE
+        });
+        FileSaver__default.saveAs(data, fileName + '_' + new Date().getTime() + EXCEL_EXTENSION);
+    }
+    saveSpreadSheet(buffer, fileName) {
+        const data = new Blob([buffer], {
+            type: EXCEL_TYPE
+        });
+        FileSaver__default.saveAs(data, new Date().getTime() + '_' + fileName);
+    }
+}
+ExportService.ɵprov = i0.ɵɵdefineInjectable({ factory: function ExportService_Factory() { return new ExportService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(CommonService), i0.ɵɵinject(ModuleConfigService)); }, token: ExportService, providedIn: "root" });
+ExportService.decorators = [
+    { type: Injectable, args: [{
+                providedIn: 'root'
+            },] }
+];
+ExportService.ctorParameters = () => [
+    { type: HttpClient },
+    { type: Injector },
+    { type: CommonService },
+    { type: ModuleConfigService }
+];
+
+const moduleMap = {};
+function loadRemoteEntry(remoteEntry) {
+    return new Promise((resolve, reject) => {
+        if (moduleMap[remoteEntry]) {
+            resolve();
+            return;
+        }
+        const script = document.createElement('script');
+        script.src = remoteEntry;
+        script.onerror = reject;
+        script.onload = () => {
+            moduleMap[remoteEntry] = true;
+            resolve(); // window is the global namespace
+        };
+        document.body.append(script);
+    });
+}
+function lookupExposedModule(remoteName, exposedModule) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // Initializes the share scope. This fills it with known provided modules from this build and all remotes
+        yield __webpack_init_sharing__('default');
+        const container = window[remoteName]; // or get the container somewhere else
+        // Initialize the container, it may provide shared modules
+        yield container.init(__webpack_share_scopes__.default);
+        const factory = yield container.get(exposedModule);
+        const Module = factory();
+        return Module;
+    });
+}
+function loadRemoteModule(options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        yield loadRemoteEntry(options.remoteEntry);
+        return yield lookupExposedModule(options.remoteName, options.exposedModule);
+    });
+}
+function loadRemotePageModule(remoteName, module, environment) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let remoteEntry = `${environment.clientDomain.appDomain}/${remoteName}/remoteEntry.js`;
+        if (!environment.production) {
+            remoteEntry = `${environment.clientDomain[remoteName]}/remoteEntry.js`;
+        }
+        const options = {
+            remoteName: remoteName,
+            remoteEntry: remoteEntry,
+            exposedModule: module,
+        };
+        return yield loadRemoteModule(options);
+    });
+}
+
+class FederationService {
+    constructor(resolver, _moduleConfigService) {
+        this.resolver = resolver;
+        this._moduleConfigService = _moduleConfigService;
+        this.environment = _moduleConfigService.getConfig().environment;
+    }
+    loadRemoteComponent(remoteName, componentName, viewContainerRef) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let remoteEntry = `${this.environment.clientDomain.appDomain}/${remoteName}/remoteEntry.js`;
+            if (!this.environment.production) {
+                remoteEntry = `${this.environment.clientDomain[remoteName]}/remoteEntry.js`;
+            }
+            const options = {
+                remoteName: remoteName,
+                remoteEntry: remoteEntry,
+                exposedModule: componentName,
+            };
+            const component = yield loadRemoteModule(options);
+            const componentFactory = this.resolver.resolveComponentFactory(component[componentName]);
+            const viewContainer = viewContainerRef.viewContainerRef;
+            viewContainer.clear();
+            const compRef = viewContainer.createComponent(componentFactory);
+            return compRef;
+        });
+    }
+    loadRemoteNewComponent(remoteName, componentName, viewContainerRef) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let remoteEntry = `${this.environment.clientDomain.appDomain}/${remoteName}/remoteEntry.js`;
+            if (!this.environment.production) {
+                remoteEntry = `${this.environment.clientDomain[remoteName]}/remoteEntry.js`;
+            }
+            const options = {
+                remoteName: remoteName,
+                remoteEntry: remoteEntry,
+                exposedModule: componentName,
+            };
+            const component = yield loadRemoteModule(options);
+            const componentFactory = this.resolver.resolveComponentFactory(component[componentName]);
+            viewContainerRef.clear();
+            const compRef = viewContainerRef.createComponent(componentFactory);
+            return compRef;
+        });
     }
 }
-StateMachinesService.ɵprov = i0.ɵɵdefineInjectable({ factory: function StateMachinesService_Factory() { return new StateMachinesService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService)); }, token: StateMachinesService, providedIn: "root" });
-StateMachinesService.decorators = [
+FederationService.ɵprov = i0.ɵɵdefineInjectable({ factory: function FederationService_Factory() { return new FederationService(i0.ɵɵinject(i0.ComponentFactoryResolver), i0.ɵɵinject(ModuleConfigService)); }, token: FederationService, providedIn: "root" });
+FederationService.decorators = [
     { type: Injectable, args: [{
                 providedIn: 'root'
             },] }
 ];
-StateMachinesService.ctorParameters = () => [
-    { type: HttpClient },
-    { type: Injector },
+FederationService.ctorParameters = () => [
+    { type: ComponentFactoryResolver },
     { type: ModuleConfigService }
 ];
 
-class CauHinhWorkflowService extends BaseService {
-    constructor(http, injector, _moduleConfigService) {
-        super(http, injector, `${_moduleConfigService.getConfig().environment.apiDomain.congviecEndpoint}/${_moduleConfigService.getConfig().environment.apiVersion}/CauHinhWorkflow`);
-        this._moduleConfigService = _moduleConfigService;
-        this.serviceCode = 'congviec';
-        this.entityName = 'CauHinhWorkflow';
-        this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.congviecEndpoint;
+class PhanQuyenModel {
+    constructor(init) {
+        this.addRoleIds = [];
+        this.removeRoleIds = [];
+        this.addPermissionIds = [];
+        this.removePermissionIds = [];
+        for (const key in init) {
+            this[key] = init[key];
+        }
     }
 }
-CauHinhWorkflowService.ɵprov = i0.ɵɵdefineInjectable({ factory: function CauHinhWorkflowService_Factory() { return new CauHinhWorkflowService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService)); }, token: CauHinhWorkflowService, providedIn: "root" });
-CauHinhWorkflowService.decorators = [
-    { type: Injectable, args: [{
-                providedIn: 'root'
-            },] }
-];
-CauHinhWorkflowService.ctorParameters = () => [
-    { type: HttpClient },
-    { type: Injector },
-    { type: ModuleConfigService }
-];
-
-class DmLoaiCongViecService extends BaseService {
-    constructor(http, injector, _moduleConfigService) {
-        super(http, injector, `${_moduleConfigService.getConfig().environment.apiDomain.congviecEndpoint}/${_moduleConfigService.getConfig().environment.apiVersion}/DM_LoaiCongViec`);
+class PermissionService extends BaseService {
+    constructor(http, injector, _moduleConfigService, _userService, _oauthService, _appContext) {
+        super(http, injector, `${_moduleConfigService.getConfig().environment.apiDomain.authorizationEndpoint}/${_moduleConfigService.getConfig().environment.apiVersion}/permission`);
         this._moduleConfigService = _moduleConfigService;
-        this.serviceCode = 'congviec';
-        this.entityName = 'DM_LoaiCongViec';
-        this.dicLoaiCongViec = {};
-        this.keyIdLoaiCongViecRoot = 'root';
-        this.getWorkflowSettingByIdLoaiCongViec = (idLoaiCongViec) => __awaiter(this, void 0, void 0, function* () {
-            if (!this.dicWorkflowByLoaiCongViec) {
-                yield this.getDatasourceWorkflowCongViec();
+        this._userService = _userService;
+        this._oauthService = _oauthService;
+        this._appContext = _appContext;
+        this.storage = sessionStorage;
+        this.ignoreAdmin = false;
+        this.delayCheckPermissions = [];
+        this.appCode = null;
+        this._config = this._moduleConfigService.getConfig();
+        this.endPoint = this._config.environment.apiDomain.authorizationEndpoint;
+        this.ignoreAdmin = this._config.environment.isIgnoreAdmin;
+        this.appCode = this._config.appCode;
+    }
+    clearPermissionCacheAll() {
+        var _a, _b, _c;
+        const lstAppCodes = (_c = (_b = (_a = this._config.environment.appMetadata) === null || _a === void 0 ? void 0 : _a.appSwitcher) === null || _b === void 0 ? void 0 : _b.map(app => app.code)) !== null && _c !== void 0 ? _c : [];
+        const lstApiEndpoint = [];
+        const apiDomain = this._config.environment.apiDomain;
+        for (const domainName in apiDomain) {
+            if (domainName.startsWith('-') || domainName.startsWith('1') || domainName == 'gateway')
+                continue;
+            const realDomainName = domainName.split('Endpoint') ? domainName.split('Endpoint')[0] : domainName;
+            lstApiEndpoint.push(realDomainName.toUpperCase());
+        }
+        return this.clearPermissionCache([...lstAppCodes, ...lstApiEndpoint]);
+    }
+    clearPermissionCache(lstModule) {
+        const url = `${this.serviceUri}/ClearPermissionCache`;
+        return this.defaultPost(url, lstModule);
+    }
+    getCurrentUserPermission() {
+        const url = `${this.serviceUri}/GetCurrentUserPermission`;
+        return this.defaultGet(url);
+    }
+    getAllBasePermission(userId) {
+        var _a, _b, _c;
+        return __awaiter(this, void 0, void 0, function* () {
+            const url = `${this.serviceUri}/GetAllBasePermission`;
+            // return sớm vì đây là trường hợp lấy permission theo Id của User
+            // ko set local storage vì sẽ làm hỏng quyền của người dùng hiện tại
+            if (userId && userId != '' && userId != this._commonService.guidEmpty()) {
+                return this.defaultGet(url + `?userId=${userId}`);
+            }
+            if (isDevMode()) {
+                return;
+            }
+            const user = this._userService.getCurrentUser();
+            if (user
+                && (user.issuperuser && user.issuperuser.toLowerCase() == 'true')
+                || (user.isadmin && user.isadmin.toLowerCase() == 'true' && !this.ignoreAdmin)) {
+                return;
+            }
+            const res = yield this.defaultGet(url);
+            const lstAppCodes = (_c = (_b = (_a = this._config.environment.appMetadata) === null || _a === void 0 ? void 0 : _a.appSwitcher) === null || _b === void 0 ? void 0 : _b.map(app => app.code)) !== null && _c !== void 0 ? _c : [];
+            // Nếu Có error lấy dữ liệu quyền tổng hợp thì quay về lấy dữ liệu quyền dựa vào từng module
+            if (!res || !res.success || res.data == null) {
+                const promiseArr = [];
+                for (const code of lstAppCodes) {
+                    promiseArr.push(this.getServicePermission(code, true));
+                }
+                yield Promise.all(promiseArr);
+                return;
+            }
+            // Set local storage cho permission của người dùng
+            for (const service of lstAppCodes) {
+                let permissions = [];
+                const serviceCode = service.toUpperCase();
+                for (const key in res.data) {
+                    if (key.toUpperCase() != serviceCode) {
+                        continue;
+                    }
+                    permissions = res.data[key];
+                    break;
+                }
+                const key = `AUTHORIZATION.${serviceCode}`;
+                const storageItem = this.storage.getItem(key);
+                if (storageItem != null) {
+                    this.storage.removeItem(key);
+                }
+                this.storage.setItem(key, JSON.stringify(permissions));
+            }
+        });
+    }
+    /**
+     * Truyền vào danh sách permision cần check
+     * @param lstPermissionCode những perrmision code cần check => nên dùng trong trường hợp check các button trong code
+     * @returns trả ra các perrmisionCode có quyền
+     */
+    getPermissionAuthorized(lstPermissionCode) {
+        return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+            const user = (yield this._userService.getCurrentUser());
+            if (user && user.issuperuser.toLowerCase() == 'true') {
+                resolve(lstPermissionCode);
+                return;
+            }
+            if (user && user.isadmin.toLowerCase() == 'true' && !this.ignoreAdmin) {
+                resolve(lstPermissionCode);
+                return;
+            }
+            const result = [];
+            for (const item of lstPermissionCode) {
+                if (yield this.isAuthorizedPermission(item)) {
+                    result.push(item);
+                }
+            }
+            resolve(result);
+        }));
+    }
+    isAuthorizedPermission(permission) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let retryCount = 0;
+            while (!this._oauthService.hasValidAccessToken()) {
+                yield this._commonService.delay(100);
+                retryCount++;
+                if (retryCount > 50) {
+                    break;
+                }
+            }
+            return yield this.checkPermission(this.appCode, permission);
+        });
+    }
+    isAuthorized(service, permission, checForMenu = false) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.root = this._appContext.getRootContext();
+            let retryCount = 0;
+            while (!this._oauthService.hasValidAccessToken()) {
+                yield this._commonService.delay(100);
+                retryCount++;
+                if (retryCount > 50) {
+                    break;
+                }
+            }
+            return yield this.checkPermission(service, permission, checForMenu);
+        });
+    }
+    checkPermission(service, permissionToCheck, checkForMenu = false) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const user = this._userService.getCurrentUser();
+                const valueIsDevMode = true;
+                if (isDevMode() && valueIsDevMode) {
+                    return true;
+                }
+                if (user && user.issuperuser && user.issuperuser.toLowerCase() == 'true' && valueIsDevMode) {
+                    return true;
+                }
+                if (user && user.isadmin && user.isadmin.toLowerCase() == 'true' && !this.ignoreAdmin && valueIsDevMode) {
+                    return true;
+                }
+                const userPermissions = yield this.getServicePermission(service);
+                if (userPermissions && userPermissions.length > 0) {
+                    return checkForMenu
+                        ? userPermissions.includes(permissionToCheck)
+                        : this._checkPermission(userPermissions, permissionToCheck);
+                }
+                else {
+                    // console.log(`Không có quyền với phân hệ [${service}]`);
+                    return false;
+                }
+            }
+            catch (_a) {
+                return false;
+            }
+        });
+    }
+    _checkPermission(userPermissions, permissionToCheck) {
+        let isAuthorized = false;
+        // check permission của người dùng
+        // duyệt qua từng permission của người dùng
+        for (const userPermission of userPermissions) {
+            // biến để break khỏi vòng khi người dùng được authorized
+            let breakOuterLoop = false;
+            // pointer permission của người dùng
+            let userPermissionPointer = 0;
+            // pointer permission đang check
+            let permissionToCheckPointer = 0;
+            // mark co the check query param
+            let aboutToCheckQueryParam = false;
+            // check từng char của 2 mảng
+            for (; permissionToCheckPointer < permissionToCheck.length;) {
+                // nếu char là ký tự bắt đầu template => tịnh tiến pointer của 2 mảng
+                let needRecheck = false;
+                if (userPermission[userPermissionPointer] == '{') {
+                    // cho đến khi tìm được ký tự '/' tiếp theo thì dừng lại
+                    for (; userPermissionPointer < userPermission.length; userPermissionPointer++) {
+                        if (userPermissionPointer == userPermission.length - 1) {
+                            break;
+                        }
+                        if (userPermission[userPermissionPointer] != '}') {
+                            continue;
+                        }
+                        if (userPermission[userPermissionPointer] === '?') {
+                            aboutToCheckQueryParam = true;
+                        }
+                        ++userPermissionPointer; // tiến tiến đến ký tự sau kết thúc template
+                        // check trường hợp trường hợp chuỗi template có dạng "{template}acsekjf"
+                        // => cần check các ký tự sau template và trước ký tự '/'
+                        if (userPermission[userPermissionPointer] != '/' && (aboutToCheckQueryParam && userPermission[userPermissionPointer] != '&')) {
+                            needRecheck = true;
+                            for (; userPermissionPointer < userPermission.length; userPermissionPointer++) {
+                                if (userPermissionPointer == userPermission.length - 1) {
+                                    break;
+                                }
+                                if (userPermission[userPermissionPointer] != '/') {
+                                    continue;
+                                }
+                                break;
+                            }
+                        }
+                        break;
+                    }
+                    for (; permissionToCheckPointer < permissionToCheck.length; permissionToCheckPointer++) {
+                        if (permissionToCheckPointer == permissionToCheck.length - 1) {
+                            break;
+                        }
+                        if (permissionToCheck[permissionToCheckPointer] == '/' || (aboutToCheckQueryParam && permissionToCheck[permissionToCheckPointer] == '&')) {
+                            break;
+                        }
+                    }
+                }
+                let breakInnerLoop = false;
+                if (needRecheck) {
+                    // check lại cho trường hợp chuỗi template có dạng "{template}acslekfj"
+                    // duyệt ngược lại cho đến khi gặp ký tự kết thúc template
+                    let tempUserPointer = userPermissionPointer;
+                    let tempToCheckPointer = permissionToCheckPointer;
+                    while (userPermission[tempUserPointer] != '}') {
+                        // ký tự khác nhau => break khỏi vòng kiểm tra trong
+                        if (userPermission[tempUserPointer].toLowerCase() != permissionToCheck[tempToCheckPointer].toLowerCase()) {
+                            breakInnerLoop = true;
+                            break;
+                        }
+                        tempUserPointer--;
+                        tempToCheckPointer--;
+                    }
+                }
+                if (breakInnerLoop) {
+                    break;
+                }
+                const userChar = userPermission[userPermissionPointer].toLowerCase();
+                const toCheckChar = permissionToCheck[permissionToCheckPointer].toLowerCase();
+                // nếu userPermission đang ở index cuối
+                if (userPermissionPointer == userPermission.length - 1) {
+                    // check char cuối của 2 mảng (trừ khi là ký tự kết thúc template)
+                    // và cũng phải là char cuối của mảng permission cần check
+                    // => người dùng authorized và break khỏi vòng lặp ngoài cùng
+                    if ((userChar == '}' || userChar == toCheckChar)
+                        && permissionToCheckPointer == permissionToCheck.length - 1) {
+                        breakOuterLoop = true;
+                        isAuthorized = true;
+                    }
+                    break;
+                }
+                // check char có giống nhau không, không giống thì break khỏi vòng check
+                if (userChar != toCheckChar) {
+                    break;
+                }
+                // nếu char giống nhau thì tiếp tục vòng lăp
+                permissionToCheckPointer++;
+                userPermissionPointer++;
             }
-            if (!idLoaiCongViec) {
-                return this.dicWorkflowByLoaiCongViec[this.keyIdLoaiCongViecRoot];
+            if (breakOuterLoop) {
+                break;
             }
-            let result = this.dicWorkflowByLoaiCongViec[idLoaiCongViec];
-            if (result)
-                return result;
-            const idLoaiCongViecs = yield this.getIdLoaiCongViecs(idLoaiCongViec);
-            if (!Array.isArray(idLoaiCongViecs))
-                return null;
-            if (idLoaiCongViecs.length > 1) {
-                for (let i = idLoaiCongViecs.length - 2; i >= 0; i--) {
-                    result = this.dicWorkflowByLoaiCongViec[idLoaiCongViecs[i]];
-                    if (result)
-                        return result;
+        }
+        return isAuthorized;
+    }
+    _checkPermissionOld(userPermissions, permissionToCheck) {
+        let isAuthorized = false;
+        // check quyền theo cách cũ nếu trường họp là phân quyền module
+        if (permissionToCheck.includes('MODULE')) {
+            return userPermissions.includes(permissionToCheck);
+        }
+        for (const userPermission of userPermissions) {
+            // Cắt chuỗi permission thành mảng để xem mỗi fragement có khớp nhau không
+            const userPermissionFragments = userPermission.split('/');
+            const permissionFragments = permissionToCheck.split('/');
+            // Mảng khác độ dài thì thoát sớm
+            if (userPermissionFragments.length != permissionFragments.length) {
+                continue;
+            }
+            // biến flag ra hiệu người dùng authorized và out vòng
+            let breakLoop = false;
+            // nếu tất cả phần tử khớp nhau => permission này trùng và người dùng được authorized
+            for (let index = 0; index < permissionFragments.length; index++) {
+                const userFragement = userPermissionFragments[index];
+                const permissionFragment = permissionFragments[index];
+                // skip qua các phần tử có ký tự bắt đầu là '{'
+                if (userFragement[0] == '{') {
+                    if (index == permissionFragments.length - 1) {
+                        isAuthorized = true;
+                        breakLoop = true;
+                    }
+                    continue;
+                }
+                if (userFragement.toLowerCase() != permissionFragment.toLowerCase()) {
+                    break;
+                }
+                if (index == permissionFragments.length - 1) {
+                    isAuthorized = true;
+                    breakLoop = true;
                 }
             }
-            if (!result) {
-                result = this.dicWorkflowByLoaiCongViec[this.keyIdLoaiCongViecRoot];
+            if (breakLoop) {
+                break;
             }
-            return result;
-        });
-        this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.congviecEndpoint;
+        }
+        return isAuthorized;
     }
-    getDatasourceWorkflowCongViec() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.dicWorkflowByLoaiCongViec) {
-                this.dicWorkflowByLoaiCongViec = {};
+    isAuthorizedByPermissions(permissions, operator = 'OR', ignoreAdmin = false) {
+        return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+            const user = (yield this._userService.getCurrentUser());
+            if (user && user.issuperuser.toLowerCase() == 'true') {
+                resolve(true);
+                return;
             }
-            const cauHinhWorkflowService = this._injector.get(CauHinhWorkflowService);
-            const cauHinhWorkflows = (yield cauHinhWorkflowService.getAll([], 'idLoaiCongViec,workflowCodes,workflowCode')).data;
-            const notifierService = this._injector.get(NotifierService);
-            if (cauHinhWorkflows == null) {
-                notifierService.showWarning('Dịch vụ workflow không phản hồi');
-                return [];
+            if (user && user.isadmin.toLowerCase() == 'true' && !this.ignoreAdmin) {
+                resolve(true);
+                return;
             }
-            const workflowCodes = [];
-            cauHinhWorkflows.forEach(itemWorkflowSetting => {
-                if (itemWorkflowSetting.workflowCodes && !Array.isArray(itemWorkflowSetting.workflowCodes)) {
-                    itemWorkflowSetting.workflowCodes = itemWorkflowSetting.workflowCodes.split(',');
-                }
-                else {
-                    itemWorkflowSetting.workflowCodes = [];
-                }
-                itemWorkflowSetting.workflowCodes.forEach(workflowCode => {
-                    if (workflowCodes.indexOf(workflowCode) == -1) {
-                        workflowCodes.push(workflowCode);
+            let isAuthorized = true;
+            if (operator.toUpperCase() == 'OR') {
+                isAuthorized = false;
+            }
+            permissions.forEach(item => {
+                this.getServicePermission(item.service).then(permissionResult => {
+                    if (operator.toUpperCase() == 'OR') {
+                        if (permissionResult.includes(item.permission)) {
+                            isAuthorized = true;
+                            return;
+                        }
                     }
-                });
-            });
-            const stateMachinesService = this._injector.get(StateMachinesService);
-            const workflows = (yield stateMachinesService.getDataDropdownByFilter([
-                this.newFilter('code', Operator.in, workflowCodes)
-            ], new DropdownOptions({
-                valueField: 'code',
-                displayField: 'title',
-                fieldPlus: 'data'
-            })));
-            workflows.forEach(item => {
-                item.data = JSON.parse(item.data);
-                const stateMachineData = item.data;
-                stateMachineData.actions = {};
-                stateMachineData.machines.forEach(machine => {
-                    stateMachineData.actions[machine.code] = [];
-                    stateMachineData.connections.forEach(conn => {
-                        if (conn.source == machine.id) {
-                            stateMachineData.actions[machine.code].push(conn);
+                    else {
+                        if (!permissionResult.includes(item.permission)) {
+                            isAuthorized = false;
+                            return;
                         }
-                    });
+                    }
+                }, error => {
+                    reject(false);
                 });
             });
-            cauHinhWorkflows.forEach(itemWorkflowSetting => {
-                itemWorkflowSetting.workflows = workflows.filter(q => itemWorkflowSetting.workflowCodes.indexOf(q.code) > -1);
-                if (!itemWorkflowSetting.idLoaiCongViec) {
-                    this.dicWorkflowByLoaiCongViec[this.keyIdLoaiCongViecRoot] = itemWorkflowSetting;
-                }
-                else {
-                    this.dicWorkflowByLoaiCongViec[itemWorkflowSetting.idLoaiCongViec] = itemWorkflowSetting;
-                }
-            });
-            return workflows;
-        });
-    }
-    getIdLoaiCongViecs(idLoaiCongViec) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const notifierService = this._injector.get(NotifierService);
-            const itemLoaiCongViec = yield this.getItemLoaiCongViec(idLoaiCongViec);
-            if (itemLoaiCongViec == null) {
-                notifierService.showWarning('Loại công việc không tồn tại');
-                return null;
-            }
-            const idLoaiCongViecs = itemLoaiCongViec.idDuongDan.split(';').filter(q => !!q);
-            return idLoaiCongViecs;
-        });
-    }
-    getItemLoaiCongViec(idLoaiCongViec) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.dicLoaiCongViec[idLoaiCongViec]) {
-                this.dicLoaiCongViec[idLoaiCongViec] = (yield this.getDetail(idLoaiCongViec)).data;
-            }
-            return this.dicLoaiCongViec[idLoaiCongViec];
-        });
-    }
-}
-DmLoaiCongViecService.ɵprov = i0.ɵɵdefineInjectable({ factory: function DmLoaiCongViecService_Factory() { return new DmLoaiCongViecService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService)); }, token: DmLoaiCongViecService, providedIn: "root" });
-DmLoaiCongViecService.decorators = [
-    { type: Injectable, args: [{
-                providedIn: 'root'
-            },] }
-];
-DmLoaiCongViecService.ctorParameters = () => [
-    { type: HttpClient },
-    { type: Injector },
-    { type: ModuleConfigService }
-];
-
-class CongViecService extends BaseService {
-    constructor(http, injector, _moduleConfigService, _dmLoaiCongViecService) {
-        super(http, injector, `${_moduleConfigService.getConfig().environment.apiDomain.congviecEndpoint}/${_moduleConfigService.getConfig().environment.apiVersion}/CongViec_Chinh`);
-        this._dmLoaiCongViecService = _dmLoaiCongViecService;
-        this.serviceCode = 'congviec';
-        this.entityName = 'CongViec_Chinh';
-        this.objectName = 'công việc';
-        this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.congviecEndpoint;
-        this._moduleConfig = _moduleConfigService.getConfig();
-    }
-    adjustSettingWorkflowForCrudList(setting) {
-        this.useWorkflow = true;
-        setting.isWorkflowTree = true;
-        setting.baseService = this;
-        setting.displayField = (item) => item.ten;
-        setting.baseService.useWorkflow = true;
-        setting.workflowConfigAdvance = {
-            getWorkflowSetting: this.getWorkflowConfig.bind(this)
-        };
+            resolve(isAuthorized);
+        }));
     }
-    getWorkflowConfig(rowData) {
+    getServicePermission(service, overrideLocalStorage = false) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this._dmLoaiCongViecService.getWorkflowSettingByIdLoaiCongViec(rowData.idLoaiCongViec);
+            const key = `AUTHORIZATION.${service.toUpperCase()}`;
+            if (!overrideLocalStorage) {
+                const storageItem = this.storage.getItem(key);
+                if (storageItem && storageItem !== 'null') {
+                    const result = JSON.parse(storageItem);
+                    return result;
+                }
+            }
+            const url = `${this.serviceUri}/GetPermissionsByService?service=${service}`;
+            const response = yield this.defaultGet(url);
+            if (!response || !response.success) {
+                return [];
+            }
+            if (overrideLocalStorage) {
+                this.storage.removeItem(key);
+            }
+            this.storage.setItem(key, JSON.stringify(response.data));
+            return response.data;
         });
     }
-    countByMenuState(data) {
-        return this.defaultPost(`${this.serviceUri}/CountByMenuState`, data);
-    }
-    getDicIdByMenuState(data, tuNgay, denNgay) {
-        return this.defaultPost(`${this.serviceUri}/GetDicIdByMenuState`, {
-            lstTrangThai: data,
-            tuNgay,
-            denNgay
-        });
+    getPermissionIdsByModule(moduleCode, userId) {
+        const url = `${this.serviceUri}/GetPermissionIdsByModule/${moduleCode}/${userId}`;
+        return this.defaultGet(url);
     }
-    updateBulkIdCha(model) {
-        const url = `${this.serviceUri}/UpdateBulkIdCha`;
+    phanQuyenNguoiDung(model) {
+        const url = `${this.serviceUri}/PhanQuyenNguoiDung`;
         return this.defaultPost(url, model);
     }
-    deleteBulkCongViecCon(ids) {
-        const url = `${this.serviceUri}/DeleteBulkCongViecCon`;
-        return this.defaultPost(url, ids);
-    }
-    getDataDashboardCaNhan(inputData) {
-        const url = `${this.serviceUri}/GetDataDashboardCaNhan`;
-        return this.defaultPost(url, inputData);
-    }
-    getDataDashboardByDonVi(inputData) {
-        const url = `${this.serviceUri}/GetDataDashboardByDonVi`;
-        return this.defaultPost(url, inputData);
-    }
-    getListTasksDashboard(dataFilter) {
-        const url = `${this.serviceUri}/getListTasksDashboard`;
-        return this.defaultPost(url, dataFilter);
-    }
 }
-CongViecService.ɵprov = i0.ɵɵdefineInjectable({ factory: function CongViecService_Factory() { return new CongViecService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService), i0.ɵɵinject(DmLoaiCongViecService)); }, token: CongViecService, providedIn: "root" });
-CongViecService.decorators = [
+PermissionService.ɵprov = i0.ɵɵdefineInjectable({ factory: function PermissionService_Factory() { return new PermissionService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService), i0.ɵɵinject(UserService), i0.ɵɵinject(i4.OAuthService), i0.ɵɵinject(ApplicationContextService)); }, token: PermissionService, providedIn: "root" });
+PermissionService.decorators = [
     { type: Injectable, args: [{
                 providedIn: 'root'
             },] }
 ];
-CongViecService.ctorParameters = () => [
+PermissionService.ctorParameters = () => [
     { type: HttpClient },
     { type: Injector },
     { type: ModuleConfigService },
-    { type: DmLoaiCongViecService }
+    { type: UserService },
+    { type: OAuthService },
+    { type: ApplicationContextService }
 ];
 
-class EntityWorkflowHistoryService extends BaseService {
+class WorkflowHistoryService extends BaseService {
     constructor(http, injector, _moduleConfigService) {
-        super(http, injector, `${_moduleConfigService.getConfig().environment.apiDomain.userOrgEndpoint}/${_moduleConfigService.getConfig().environment.apiVersion}/EntityWorkflowHistory`);
-        this.entityName = 'EntityWorkflowHistory';
+        super(http, injector, `${_moduleConfigService.getConfig().environment.apiDomain.workflowEndpoint}/${_moduleConfigService.getConfig().environment.apiVersion}/WorkflowHistory`);
         this.serviceManagers = {};
-        this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.userOrgEndpoint;
+        this.entityName = 'WorkflowHistory';
+        this.serviceCode = 'workflow';
+        this.apiDomain = _moduleConfigService.getConfig().environment.apiDomain;
+        this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.workflowEndpoint;
         this._moduleConfig = _moduleConfigService.getConfig();
+        this.apiVersion = _moduleConfigService.getConfig().environment.apiVersion;
     }
-    registerService(entityName, service) {
-        this.serviceManagers[entityName] = service;
+    registerService(settingKey, service) {
+        this.serviceManagers[settingKey] = service;
     }
     getEndpointByService(service) {
         return `${service.endPoint}/${this._moduleConfig.environment.apiVersion}`;
     }
-    setCurrentServiceUri(tableName) {
-        const service = this.serviceManagers[tableName];
-        if (service == undefined) {
-            (this._injector.get(NotifierService)).showWarning('Bạn chưa đăng ký base service cho entity workflow history');
-        }
-        this.serviceUri = `${this.getEndpointByService(service)}/EntityWorkflowHistory`;
+    changeEndpoint(baseService) {
+        this.serviceUri = `${this.getEndpointByService(baseService)}/WorkflowHistory`;
+        return this;
     }
-    getLastHistory(tableName, filters = []) {
-        const service = this.serviceManagers[tableName];
-        if (service == undefined) {
-            (this._injector.get(NotifierService)).showWarning('Bạn chưa đăng ký base service cho entity workflow history');
+    getLastByItemId(itemId) {
+        // return this.getDetailByFilter(
+        //     [
+        //         this.newFilter('itemId', Operator.equal, itemId)
+        //     ],
+        //     [{ field: 'time', dir: -1 }]
+        // );
+        return this.defaultPost(`${this.serviceUri}/GetLastByItemIdInMainThread/${itemId}`, {});
+    }
+    choYKien(model) {
+        return this.defaultPost(`${this.serviceUri}/ChoYKien`, model);
+    }
+    getAllObjectRelated(serviceCode, entity, entityKey, fullApiUrl = null) {
+        let apiUrl = fullApiUrl || this.apiDomain[`${serviceCode}Endpoint`];
+        if (!apiUrl) {
+            throw new Error(`Không tìm thấy api endpoint ứng với service ${serviceCode}`);
         }
-        const url = `${this.getEndpointByService(service)}/EntityWorkflowHistory/GetLastByFilter`;
-        const gridInfo = {
-            pageInfo: {
-                page: 1,
-                pageSize: 1
-            },
-            filters,
-            sorts: [
-                new Sort({ field: 'created', dir: 1 })
-            ]
-        };
-        return this.defaultPost(url, gridInfo);
+        apiUrl = `${apiUrl}/${this.apiVersion}/WorkflowHistory/GetAllObjectRelated/${entity}/${entityKey}`;
+        return this.defaultGet(apiUrl);
     }
 }
-EntityWorkflowHistoryService.ɵprov = i0.ɵɵdefineInjectable({ factory: function EntityWorkflowHistoryService_Factory() { return new EntityWorkflowHistoryService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService)); }, token: EntityWorkflowHistoryService, providedIn: "root" });
-EntityWorkflowHistoryService.decorators = [
+WorkflowHistoryService.ɵprov = i0.ɵɵdefineInjectable({ factory: function WorkflowHistoryService_Factory() { return new WorkflowHistoryService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService)); }, token: WorkflowHistoryService, providedIn: "root" });
+WorkflowHistoryService.decorators = [
     { type: Injectable, args: [{
                 providedIn: 'root'
             },] }
 ];
-EntityWorkflowHistoryService.ctorParameters = () => [
+WorkflowHistoryService.ctorParameters = () => [
     { type: HttpClient },
     { type: Injector },
     { type: ModuleConfigService }
@@ -18346,83 +18366,66 @@ WorkflowPermissionDetailService.ctorParameters = () => [
     { type: ModuleConfigService }
 ];
 
-class WorkflowHistoryService extends BaseService {
-    constructor(http, injector, _moduleConfigService) {
-        super(http, injector, `${_moduleConfigService.getConfig().environment.apiDomain.workflowEndpoint}/${_moduleConfigService.getConfig().environment.apiVersion}/WorkflowHistory`);
-        this.serviceManagers = {};
-        this.entityName = 'WorkflowHistory';
-        this.serviceCode = 'workflow';
-        this.apiDomain = _moduleConfigService.getConfig().environment.apiDomain;
-        this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.workflowEndpoint;
-        this._moduleConfig = _moduleConfigService.getConfig();
-        this.apiVersion = _moduleConfigService.getConfig().environment.apiVersion;
-    }
-    registerService(settingKey, service) {
-        this.serviceManagers[settingKey] = service;
-    }
-    getEndpointByService(service) {
-        return `${service.endPoint}/${this._moduleConfig.environment.apiVersion}`;
-    }
-    changeEndpoint(baseService) {
-        this.serviceUri = `${this.getEndpointByService(baseService)}/WorkflowHistory`;
-        return this;
-    }
-    getLastByItemId(itemId) {
-        // return this.getDetailByFilter(
-        //     [
-        //         this.newFilter('itemId', Operator.equal, itemId)
-        //     ],
-        //     [{ field: 'time', dir: -1 }]
-        // );
-        return this.defaultPost(`${this.serviceUri}/GetLastByItemIdInMainThread/${itemId}`, {});
-    }
-    choYKien(model) {
-        return this.defaultPost(`${this.serviceUri}/ChoYKien`, model);
-    }
-    getAllObjectRelated(serviceCode, entity, entityKey, fullApiUrl = null) {
-        let apiUrl = fullApiUrl || this.apiDomain[`${serviceCode}Endpoint`];
-        if (!apiUrl) {
-            throw new Error(`Không tìm thấy api endpoint ứng với service ${serviceCode}`);
+var sort_by;
+(function () {
+    const defaultCompareFunc = function (a, b) {
+        if (a == b)
+            return 0;
+        return a < b ? -1 : 1;
+    };
+    const getCompareFunc = function (primer, reverse) {
+        const defaultCompare = defaultCompareFunc;
+        let compare = defaultCompareFunc;
+        if (primer) {
+            compare = function (a, b) {
+                return defaultCompare(primer(a), primer(b));
+            };
         }
-        apiUrl = `${apiUrl}/${this.apiVersion}/WorkflowHistory/GetAllObjectRelated/${entity}/${entityKey}`;
-        return this.defaultGet(apiUrl);
-    }
-}
-WorkflowHistoryService.ɵprov = i0.ɵɵdefineInjectable({ factory: function WorkflowHistoryService_Factory() { return new WorkflowHistoryService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService)); }, token: WorkflowHistoryService, providedIn: "root" });
-WorkflowHistoryService.decorators = [
-    { type: Injectable, args: [{
-                providedIn: 'root'
-            },] }
-];
-WorkflowHistoryService.ctorParameters = () => [
-    { type: HttpClient },
-    { type: Injector },
-    { type: ModuleConfigService }
-];
-
-class BasePermissionService extends BaseService {
-    constructor(http, injector, _moduleConfigService) {
-        super(http, injector, `${_moduleConfigService.getConfig().environment.apiDomain.authorizationEndpoint}/${_moduleConfigService.getConfig().environment.apiVersion}/BasePermission`);
-        this._moduleConfigService = _moduleConfigService;
-        this.entityName = 'BasePermission';
-        this.serviceCode = 'Authorization';
-        this.endPoint = _moduleConfigService.getConfig().environment.apiDomain.authorizationEndpoint;
-    }
-    getPermissionByCode(code) {
-        return this.defaultGet(`${this.serviceUri}/GetPermissionByCode?code=${code}`);
-    }
-}
-BasePermissionService.ɵprov = i0.ɵɵdefineInjectable({ factory: function BasePermissionService_Factory() { return new BasePermissionService(i0.ɵɵinject(i1$1.HttpClient), i0.ɵɵinject(i0.INJECTOR), i0.ɵɵinject(ModuleConfigService)); }, token: BasePermissionService, providedIn: "root" });
-BasePermissionService.decorators = [
-    { type: Injectable, args: [{
-                providedIn: 'root'
-            },] }
-];
-BasePermissionService.ctorParameters = () => [
-    { type: HttpClient },
-    { type: Injector },
-    { type: ModuleConfigService }
-];
+        if (reverse) {
+            return function (a, b) {
+                return -1 * compare(a, b);
+            };
+        }
+        return compare;
+    };
+    sort_by = function (...args) {
+        const fields = [], n_fields = args.length;
+        let field, name, cmp;
+        // preprocess sorting options
+        for (let i = 0; i < n_fields; i++) {
+            field = args[i];
+            if (typeof field === 'string') {
+                name = field;
+                cmp = defaultCompareFunc;
+            }
+            else {
+                name = field.name;
+                cmp = getCompareFunc(field.primer, field.reverse);
+            }
+            fields.push({
+                name: name,
+                cmp: cmp
+            });
+        }
+        // final comparison function
+        return function (A, B) {
+            let name, result;
+            for (let i = 0; i < n_fields; i++) {
+                result = 0;
+                field = fields[i];
+                name = field.name;
+                result = field.cmp(A[name], B[name]);
+                if (result !== 0)
+                    break;
+            }
+            return result;
+        };
+    };
+}());
+// multipleSort('idTinhThanh', 'idQuanHuyen')
+// multipleSort({name: 'idTinhThanh', reverse: true}, 'idQuanHuyen')
+// multipleSort({name: 'soThuTu', primer: parseInt}, 'idQuanHuyen') // parseInt là function
+const multipleSort = sort_by;
 
 class ListComponentBase extends ComponentBase {
     constructor(_injector, _isTreeTable) {
@@ -19675,15 +19678,15 @@ class ListComponentBase extends ComponentBase {
             const result = newArr.reduce((x, y) => y.colSpan + x, 0);
             return result > a ? result : a;
         }, 0);
-        const startIndex = this.setting.hiddenCheckbox ? 0 : 1;
         const endIndex = maxColSize - (this.setting.hiddenFunctionColumn ? 1 : 2);
         for (let ind = 0; ind < lstRow.length; ind++) {
             const arrTh = [...allTh[ind]];
+            const startIndex = arrTh[0].className.includes('chkbox') ? 1 : 0;
             if (startIndex > endIndex) {
                 return null;
             }
             result[ind] = (_a = result[ind]) !== null && _a !== void 0 ? _a : [];
-            let colIndex = 0;
+            let colIndex = result[ind].length;
             const numOfColSpan = arrTh.reduce((x, y) => x + y.colSpan - 1, 0);
             for (let i = startIndex; i <= endIndex - numOfColSpan; i++) {
                 if (arrTh[i]) {
@@ -19845,6 +19848,7 @@ class ListComponentBase extends ComponentBase {
     }
     getValueCheckboxFormat(data) {
         const checkBox = data.querySelector('p-checkbox');
+        const input = data.querySelector('input');
         if (checkBox) {
             const value = data.querySelector('span.pi-check');
             if (value) {
@@ -19854,6 +19858,9 @@ class ListComponentBase extends ComponentBase {
                 return 'Không';
             }
         }
+        if (input) {
+            return input.value;
+        }
         return '';
     }
     view(rowData) {