Commit graph

3473 commits

Author SHA1 Message Date
harid
f4be31ed08 test(4) #2160 2026-01-09 18:40:10 +07:00
53d6be09d5 Merge branch 'main' into develop
* main:
  update search dna
  search dna
2026-01-09 17:20:42 +07:00
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
d6c198bc30 Merge branch 'main' into develop
* main:
  search salary
2026-01-09 17:15:47 +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
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
f0334c69fc fix bug: report time record (rollback code group) 2026-01-09 15:53:23 +07:00
0239f22e40 fix group by profile 2026-01-09 15:13:57 +07:00
harid
9aea3cc88c test(2) #2160 2026-01-09 14:25:04 +07:00
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
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
3d34a4c5ef migrate table posMaster 2026-01-09 10:53:32 +07:00
f2a3e60430 fix bug return profile id 2026-01-09 10:37:33 +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
01cffa44aa comment ออกก่อนเพราะยังไม่ได้ใช้ #2154 2026-01-06 13:10:57 +07:00
784b9cc441 fix 2026-01-05 13:11:55 +07:00
37245744c9 #2153 2026-01-05 11:35:49 +07:00
mamoss
32e682d05e search dna 2026-01-02 21:43:57 +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
7334fd711f migration: add field dnaId and profileId 2025-12-26 22:04:17 +07:00
harid
428b995081 no message 2025-12-24 17:48:22 +07:00
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
8083d9a0ae fix issue #1831, #2086, #2126, 2025-12-23 16:00:04 +07:00
f605f59b6e #2146 2025-12-22 17:14:56 +07:00
0caec00c75 fix 2025-12-22 17:05:54 +07:00
harid
a963841306 ค้นหารายชื่อผู้ยื่นอุธรณ์/ร้องทุกข์ 2025-12-22 16:26:29 +07:00
4479507ae8 fix brother privilage 2025-12-19 13:58:40 +07:00
18ae347122 #2139 2025-12-18 18:31:04 +07:00
6d31b84a2c Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-12-18 18:16:45 +07:00
2917d8b593 fix 2025-12-18 18:16:32 +07:00
harid
fd22fcf990 log user 2025-12-18 17:29:18 +07:00
harid
586331e870 API ตรวจสอบเช็คเลขบัตรประจำตัวประชาชน ทำไว้ให้ service อื่นๆ ภายในระบบ call มาตรวจสอบเลขบัตรประจำตัวประชาชน 2025-12-17 12:37:05 +07:00
a813d31df9 #2123
Some checks failed
release / release (push) Failing after 8s
2025-12-15 17:30:33 +07:00
e20eb9e936 fix search
Some checks failed
release / release (push) Failing after 9s
2025-12-15 14:06:07 +07:00
3111e10bfe #2119
Some checks failed
release / release (push) Failing after 11s
2025-12-15 11:48:18 +07:00
harid
5e9189a489 เพิ่มฟิลด์ isSalary + api แก้ไขเงินเดือนทั้งกลุ่ม #2102 2025-12-12 18:27:32 +07:00
mamoss
3a4e16deb0 add permission brother 2025-12-12 01:36:51 +07:00
c9f4e8f3eb 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:
2025-12-11 17:30:21 +07:00
e9797cdd82 Merge branch 'develop'
* develop:
  migrate view #2109
  comment
  แก้ parent
  update permission
2025-12-11 17:27:36 +07:00
harid
878e52b1b0 migrate view #2109 2025-12-09 18:16:46 +07:00
mamoss
a4d87d7051 Merge branch 'develop' 2025-12-07 22:10:57 +07:00
mamoss
84f14466c7 comment 2025-12-07 22:10:29 +07:00
mamoss
a8bb884564 แก้ parent 2025-12-07 16:36:18 +07:00
mamoss
f814454003 update permission 2025-12-07 13:51:01 +07:00
2e90440dea Merge branch 'develop'
* develop:
  fix role
2025-12-03 19:48:01 +07:00
bebd56b2e2 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:
2025-12-03 19:34:18 +07:00