3818 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
harid	f4be31ed08	test(4) #2160	2026-01-09 18:40:10 +07:00
waruneeauy	c699e1c15f	Merge branch 'develop' into dev ... * develop: update search dna search dna search salary	2026-01-09 17:21:15 +07:00
waruneeauy	53d6be09d5	Merge branch 'main' into develop ... * main: update search dna search dna	2026-01-09 17:20:42 +07:00
waruneeauy	77824bb04f	Merge branch 'main' of ssh://hrms-git.bangkok.go.th:6611/BMA-HRMS/hrms-api-org ... * 'main' of ssh://hrms-git.bangkok.go.th:6611/BMA-HRMS/hrms-api-org: (38 commits) fix bug: report time record (rollback code group) fix group by profile test(2) #2160 migrate table posMaster fix bug return profile id test #2160 update search update search dna comment ออกก่อนเพราะยังไม่ได้ใช้ #2154 fix #2153 search dna update search org old migration: add field dnaId and profileId no message fix issue #1831, #2086, #2126, #2146 fix ค้นหารายชื่อผู้ยื่นอุธรณ์/ร้องทุกข์ fix brother privilage ...	2026-01-09 17:18:49 +07:00
waruneeauy	d6c198bc30	Merge branch 'main' into develop ... * main: search salary	2026-01-09 17:15:47 +07:00
harid	c037cbca88	Merge branch 'develop' into dev	2026-01-09 16:39:00 +07:00
harid	804ee8a639	test(3) #2160	2026-01-09 16:38:42 +07:00
harid	65789c6ac6	test(3) #2160	2026-01-09 16:37:24 +07:00
waruneeauy	78213d9164	Merge branch 'develop' ... * develop: fix bug: report time record (rollback code group) fix group by profile test(2) #2160	2026-01-09 16:18:30 +07:00
waruneeauy	325bd2754b	Merge branch 'develop' into dev ... * develop: fix bug: report time record (rollback code group)	2026-01-09 15:53:36 +07:00
waruneeauy	f0334c69fc	fix bug: report time record (rollback code group)	2026-01-09 15:53:23 +07:00
waruneeauy	6c964c46ba	Merge branch 'develop' into dev ... * develop: fix group by profile	2026-01-09 15:14:09 +07:00
waruneeauy	0239f22e40	fix group by profile	2026-01-09 15:13:57 +07:00
harid	da4d24ac4d	Merge branch 'develop' into dev	2026-01-09 14:25:26 +07:00
harid	9aea3cc88c	test(2) #2160	2026-01-09 14:25:04 +07:00
waruneeauy	283de98d37	Merge branch 'main' of ssh://hrms-git.bangkok.go.th:6611/BMA-HRMS/hrms-api-org ... * 'main' of ssh://hrms-git.bangkok.go.th:6611/BMA-HRMS/hrms-api-org: update search dna search dna # Conflicts: # src/controllers/OrganizationDotnetController.ts	2026-01-09 10:59:16 +07:00
waruneeauy	34985e847a	Merge branch 'develop' ... * develop: migrate table posMaster fix bug return profile id test #2160 update search comment ออกก่อนเพราะยังไม่ได้ใช้ #2154 fix #2153 update search org old migration: add field dnaId and profileId no message	2026-01-09 10:56:51 +07:00
waruneeauy	2ea262cd6f	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:	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
harid	5017eab797	Merge branch 'develop' into dev	2026-01-08 16:09:55 +07:00
harid	3f1aff32dd	test #2160	2026-01-08 16:09:25 +07:00
mamoss	dea1b11e1b	update search	2026-01-07 01:44:18 +07:00
mamoss	a69220556c	update search dna	2026-01-07 01:42:32 +07:00
harid	c9d0ea143c	Merge branch 'develop' into dev	2026-01-06 13:11:42 +07:00
harid	01cffa44aa	comment ออกก่อนเพราะยังไม่ได้ใช้ #2154	2026-01-06 13:10:57 +07:00
Adisak	91d917a5cd	Merge branch 'develop' into dev	2026-01-05 13:12:12 +07:00
Adisak	784b9cc441	fix	2026-01-05 13:11:55 +07:00
Adisak	0cd6926101	Merge branch 'develop' into dev	2026-01-05 11:36:21 +07:00
Adisak	37245744c9	#2153	2026-01-05 11:35:49 +07:00
mamoss	32e682d05e	search dna	2026-01-02 21:43:57 +07:00
waruneeauy	c1a12eff60	Merge branch 'develop' into dev ... * develop: update search org old	2025-12-31 07:41:54 +07:00
mamoss	f38649953d	Merge branch 'develop'	2025-12-30 22:37:07 +07:00
mamoss	3feda8b601	update search org old	2025-12-30 22:36:42 +07:00
waruneeauy	a71d18d6e0	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:	2025-12-26 22:40:54 +07:00
waruneeauy	0aaeb558df	Merge branch 'develop' into dev ... * develop: migration: add field dnaId and profileId no message	2025-12-26 22:40:46 +07:00
waruneeauy	7334fd711f	migration: add field dnaId and profileId	2025-12-26 22:04:17 +07:00
harid	d8420d48b1	Merge branch 'develop' into dev	2025-12-24 17:48:52 +07:00
harid	428b995081	no message	2025-12-24 17:48:22 +07:00
waruneeauy	841fc648f6	Merge branch 'develop' ... * develop: fix issue #1831, #2086, #2126, #2146 fix ค้นหารายชื่อผู้ยื่นอุธรณ์/ร้องทุกข์ fix brother privilage #2139 fix log user API ตรวจสอบเช็คเลขบัตรประจำตัวประชาชน ทำไว้ให้ service อื่นๆ ภายในระบบ call มาตรวจสอบเลขบัตรประจำตัวประชาชน #2123 fix search #2119 เพิ่มฟิลด์ isSalary + api แก้ไขเงินเดือนทั้งกลุ่ม #2102 add permission brother	2025-12-23 17:16:15 +07:00
harid	8ac7e81f95	Merge branch 'develop' into dev	2025-12-23 16:00:44 +07:00
harid	8083d9a0ae	fix issue #1831, #2086, #2126,	2025-12-23 16:00:04 +07:00
Adisak	d768f24754	Merge branch 'develop' into dev	2025-12-22 17:15:12 +07:00
Adisak	f605f59b6e	#2146	2025-12-22 17:14:56 +07:00
Adisak	0412e89fe5	Merge branch 'develop' into dev	2025-12-22 17:06:24 +07:00
Adisak	0caec00c75	fix	2025-12-22 17:05:54 +07:00
harid	85e9f491d3	Merge branch 'develop' into dev	2025-12-22 16:27:00 +07:00
harid	a963841306	ค้นหารายชื่อผู้ยื่นอุธรณ์/ร้องทุกข์	2025-12-22 16:26:29 +07:00
Adisak	e8567ee39b	Merge branch 'develop' into dev	2025-12-19 13:58:56 +07:00