hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop

Browse source
This commit is contained in:
Kittapath 2024-06-12 10:45:30 +07:00
commit 17b3f0aab4
3 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/ChangePositionController.ts
View file

@ -24,7 +24,7 @@ import { Equal, ILike, In, IsNull, Like, Not, Brackets, MoreThan } from "typeorm
import { RequestWithUser } from "../middlewares/user";
import { ChangePosition, CreateChangePosition, UpdateChangePosition } from "../entities/ChangePosition";
@Route("api/v1/placement/change-position")
@Route("api/v1/org/placement/change-position")
@Tags("Placement")
@Security("bearerAuth")
@Response(

2
src/entities/AuthRoleAttr.ts
View file

@ -73,7 +73,7 @@ export class AuthRoleAttr extends EntityBase {
comment: "Root",
default: null,
})
parentNode?: string | null;
parentNode?: string;
@ManyToOne(() => AuthSys, (authSys) => authSys.authSys)
@JoinColumn({ name: "authSysId" })

22
src/migration/1718163843179-update_table_role_add_node.ts Normal file
View file

@ -0,0 +1,22 @@
import { MigrationInterface, QueryRunner } from "typeorm";
export class UpdateTableRoleAddNode1718163843179 implements MigrationInterface {
name = 'UpdateTableRoleAddNode1718163843179'
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`employeePosMaster\` ADD \`isDirector\` tinyint NOT NULL COMMENT 'เป็นผู้อำนวยการ' DEFAULT 0`);
await queryRunner.query(`ALTER TABLE \`employeePosMaster\` ADD \`isOfficer\` tinyint NOT NULL COMMENT 'เป็นเจ้าหน้าที่' DEFAULT 0`);
await queryRunner.query(`ALTER TABLE \`posMaster\` ADD \`isDirector\` tinyint NOT NULL COMMENT 'เป็นผู้อำนวยการ' DEFAULT 0`);
await queryRunner.query(`ALTER TABLE \`posMaster\` ADD \`isOfficer\` tinyint NOT NULL COMMENT 'เป็นเจ้าหน้าที่' DEFAULT 0`);
await queryRunner.query(`ALTER TABLE \`authRoleAttr\` ADD \`parentNode\` varchar(255) NULL COMMENT 'Root'`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE \`authRoleAttr\` DROP COLUMN \`parentNode\``);
await queryRunner.query(`ALTER TABLE \`posMaster\` DROP COLUMN \`isOfficer\``);
await queryRunner.query(`ALTER TABLE \`posMaster\` DROP COLUMN \`isDirector\``);
await queryRunner.query(`ALTER TABLE \`employeePosMaster\` DROP COLUMN \`isOfficer\``);
await queryRunner.query(`ALTER TABLE \`employeePosMaster\` DROP COLUMN \`isDirector\``);
}
}