Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-api-org into dev

* 'dev' of https://192.168.1.60/hrms-bangkok/hrms-api-org:
Merge branch 'develop' into dev
2026-01-09 10:56:26 +07:00 · 2026-01-09 10:56:21 +07:00 · 2026-01-09 10:53:32 +07:00 · 2026-01-09 10:37:33 +07:00
2 changed files with 19 additions and 1 deletions
--- a/src/controllers/OrganizationDotnetController.ts
+++ b/src/controllers/OrganizationDotnetController.ts
@ -6195,7 +6195,7 @@ export class OrganizationDotnetController extends Controller {
          });

          return {
-            id: item.id,
+            id: item.profileId,
            prefix: item.prefix,
            firstName: item.firstName,
            lastName: item.lastName,
--- a/src/migration/1767930614165-update_table_posMasterHistory.ts
+++ b/src/migration/1767930614165-update_table_posMasterHistory.ts
@ -0,0 +1,18 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class UpdateTablePosMasterHistory1767930614165 implements MigrationInterface {
+    name = 'UpdateTablePosMasterHistory1767930614165'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`posMasterHistory\` ADD \`profileId\` varchar(40) NULL COMMENT 'คีย์นอก(FK)ของตาราง profile'`);
+        await queryRunner.query(`ALTER TABLE \`posMasterHistory\` ADD \`rootDnaId\` varchar(40) NULL COMMENT 'dna ของตาราง orgRoot'`);
+        await queryRunner.query(`ALTER TABLE \`posMasterHistory\` ADD \`child1DnaId\` varchar(40) NULL COMMENT 'dna ของตาราง orgChild1'`);
+        await queryRunner.query(`ALTER TABLE \`posMasterHistory\` ADD \`child2DnaId\` varchar(40) NULL COMMENT 'dna ของตาราง orgChild2'`);
+        await queryRunner.query(`ALTER TABLE \`posMasterHistory\` ADD \`child3DnaId\` varchar(40) NULL COMMENT 'dna ของตาราง orgChild3'`);
+        await queryRunner.query(`ALTER TABLE \`posMasterHistory\` ADD \`child4DnaId\` varchar(40) NULL COMMENT 'dna ของตาราง orgChild4'`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+    }
+
+}
Author	SHA1	Message	Date
waruneeauy	2ea262cd6f	Merge branch 'dev' of https://192.168.1.60/hrms-bangkok/hrms-api-org into dev All checks were successful Build & Deploy on Dev / build (push) Successful in 1m4s Details * 'dev' of https://192.168.1.60/hrms-bangkok/hrms-api-org:	2026-01-09 10:56:26 +07:00
waruneeauy	7253f51568	Merge branch 'develop' into dev * develop: migrate table posMaster fix bug return profile id test #2160 update search comment ออกก่อนเพราะยังไม่ได้ใช้ #2154 fix #2153	2026-01-09 10:56:21 +07:00
waruneeauy	3d34a4c5ef	migrate table posMaster	2026-01-09 10:53:32 +07:00
waruneeauy	f2a3e60430	fix bug return profile id	2026-01-09 10:37:33 +07:00