Commit graph

2833 commits

Author SHA1 Message Date
mamoss
93c65581fa Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-05-14 17:07:11 +07:00
mamoss
a9a35342e5 add posexe org 2025-05-14 17:07:04 +07:00
b954ae9716 Merge branch 'develop' into adiDev 2025-05-14 15:56:08 +07:00
4be044116b add posTypeShortName 2025-05-14 15:54:14 +07:00
mamoss
18b1171c34 add isduty 2025-05-14 15:30:22 +07:00
mamoss
e1ff9e6103 Merge branch 'main' into develop 2025-05-14 15:03:35 +07:00
mamoss
635ca1683c add isDeputy 2025-05-14 15:03:20 +07:00
f015ea6015 test #1415 2025-05-14 14:06:14 +07:00
mamoss
943bb42ffb add " " 2025-05-14 01:50:24 +07:00
mamoss
02e1e36a9c add short name level 2025-05-14 01:43:04 +07:00
mamoss
2466525e8e sort 2025-05-13 17:03:09 +07:00
mamoss
07f3801084 return data 2025-05-13 16:56:06 +07:00
mamoss
2477a29ef3 Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-05-13 16:52:23 +07:00
mamoss
ba9937510c sort 2025-05-13 16:52:14 +07:00
31efc01015 fix 2025-05-13 15:41:49 +07:00
00de87822a Merge branch 'adiDev' into develop 2025-05-13 14:50:37 +07:00
29f27faaad isGood in snapshot 2025-05-13 14:49:24 +07:00
mamoss
79712aa7bf update date sort 2025-05-13 14:00:17 +07:00
mamoss
c1e7ee2542 update sort date 2025-05-13 13:56:01 +07:00
mamoss
0266dab4ac kk1 date 2025-05-13 13:07:52 +07:00
mamoss
e4708c6f98 Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-05-13 11:49:08 +07:00
mamoss
0baa23abcc report kk1 2025-05-13 11:48:45 +07:00
Bright
d65b25187c ออกจากราชการ ไม่ต้องลบตำแหน่งในทะเบียน issue #1516 2025-05-13 10:56:54 +07:00
mamoss
dbdf136d97 add วันที่มีผลคำสั่ง 2025-05-09 12:39:07 +07:00
mamoss
a61825eb57 Merge branch 'main' into develop 2025-05-09 12:24:06 +07:00
mamoss
b312e7d8f6 edit probation 2025-05-08 14:47:54 +07:00
mamoss
90f6b5061a ออกคำสั่งทดลองงาน 2025-05-08 12:29:06 +07:00
465d21eb13 #124 2025-05-08 09:21:35 +07:00
mamoss
5584124772 add kk 2025-05-08 00:35:08 +07:00
mamoss
0ad11a37ee add org kk 2025-05-08 00:19:19 +07:00
mamoss
8273cfabc1 กรองคน 2025-05-07 23:59:26 +07:00
ea7040f462 no message 2025-05-07 17:57:43 +07:00
3d1179adc7 fix command21 2025-05-07 17:41:49 +07:00
ccf64bfa6d Merge branch 'develop' into adiDev 2025-05-07 14:07:02 +07:00
684ab042f9 fix dotnet/citicenId 2025-05-07 14:03:39 +07:00
mamoss
5e1da75b94 Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-05-07 13:31:14 +07:00
mamoss
e6f285ad3a filter pos emp 2025-05-07 13:31:07 +07:00
381b9088ac fix 2025-05-07 11:42:33 +07:00
81882a66a5 fix 2025-05-06 18:46:43 +07:00
14b824fe3d fix #1183 2025-05-06 18:23:07 +07:00
397c39f92a Merge branch 'adiDev' into develop 2025-05-06 17:57:38 +07:00
dbdf3b454f #118 2025-05-06 17:56:05 +07:00
mamoss
66a2d99826 เป็นลูกจ้างประจำ ลบออกจากโครงสร้าง 2025-05-06 17:38:02 +07:00
1c7180bcf2 Merge branch 'adiDev' into develop 2025-05-06 15:27:27 +07:00
1c9cb0055a #1183 2025-05-06 15:24:38 +07:00
mamoss
8c170f50c8 Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop 2025-05-06 15:04:38 +07:00
mamoss
ea90dfd16e ตำแหน่งลูกจ้าง 2025-05-06 15:04:31 +07:00
Bright
e095e3693a no message 2025-05-06 13:10:09 +07:00
Bright
16f3d3da4f return dna & fix/add fields 2025-05-06 12:13:56 +07:00
1a59a7078f Merge branch 'adiDev' into develop 2025-05-06 11:57:45 +07:00