Commit graph

2652 commits

Author SHA1 Message Date
AdisakKanthawilang
45cc074e81
update validate privilege (#201) 2025-10-20 17:45:43 +07:00
Harid Promsri
25f3a6535f
แก้ค้นหาชื่อลูกจ้าง (#199)
Co-authored-by: harid <harid_pr61@live.rmutl.com>
2025-10-20 16:38:44 +07:00
76d09eaa03 Merge branch 'develop' into adiDev 2025-10-17 17:39:29 +07:00
0d059f24ea update validate สิทธิ์จัดการโครงสร้างในเมนูโครงสร้างอัตตรากำลัง 2025-10-17 17:38:54 +07:00
Harid Promsri
6e9015b1e6
Fix #1836 (#197)
Co-authored-by: harid <harid_pr61@live.rmutl.com>
2025-10-17 17:02:19 +07:00
5cdcc2a91e update privilage validate (NORMAL) and update calRetireLaw 2025-10-17 16:05:42 +07:00
897dda67ad Merge branch 'develop' into adiDev 2025-10-17 13:52:06 +07:00
645f9760f0 update privilege validate (OWNER) 2025-10-17 13:51:43 +07:00
6554636eeb fix: range date of retire 2025-10-17 12:14:35 +07:00
a25b017bad fix retire: table name & add status isLeave, isRetirement 2025-10-17 11:07:26 +07:00
mamoss
f2efb44336 หาคนเกษียณตามปี 2025-10-16 23:04:50 +07:00
mamoss
58274b479c สิทธิ์ดูโครงสร้าง 2025-10-16 00:33:48 +07:00
ef26d0f305 fix 2025-10-15 11:52:52 +07:00
harid
1a50a62b7a เพิ่มเคลีย isSit เป็น 0 #193 2025-10-14 09:13:44 +07:00
mamoss
bfea0438f8 test parent 2025-10-12 16:51:21 +07:00
e23d89c9cd
Merge pull request #192 from Frappet/issue/#1836
fix #1836 ปรับให้แสดงตามตำแหน่งที่บรรจุ
2025-10-10 10:22:13 +07:00
mamoss
c1f3de5619 delete comment 2025-10-10 00:21:44 +07:00
mamoss
a4f7b021a0 Merge branch 'task/173' into develop 2025-10-09 23:24:59 +07:00
mamoss
847d9c302f cdhแก้คิวรี่ให้เร็วขึ้น สร้าง workflow 2025-10-09 23:24:04 +07:00
harid
c500ff4b7a fix #1836 ปรับให้แสดงตามตำแหน่งที่บรรจุ 2025-10-09 14:49:55 +07:00
Kittapath
6328de1a5c
remove role add relation (#191)
Co-authored-by: mamoss <>
2025-10-08 23:03:02 +07:00
AdisakKanthawilang
e0e850b4c7
ปรับเงื่อนไข admin ให้เห็นข้อมูลทั้งสังกัด (#186) 2025-10-07 17:18:54 +07:00
AdisakKanthawilang
564d7d96c3
#176 (#185)
* #176

* delete log
2025-10-07 14:59:11 +07:00
mamoss
fd17f366b8 add parent 2025-10-07 11:14:00 +07:00
Kittapath
4c16c9859a
test commit (#184)
Co-authored-by: mamoss <>
2025-10-06 17:24:36 +07:00
Kittapath
40f1a08b90
refactor code create user emp (#177)
Co-authored-by: mamoss <>
2025-10-06 15:08:15 +07:00
harid
bb13a34dfa send admin token 2025-10-06 10:33:21 +07:00
cd9c1721c1 fix sort registry and filter node of registry retire 2025-10-04 13:54:17 +07:00
abab998cd0 fix bug run delete keycloak 2025-10-03 22:18:32 +07:00
f28aca5c1d rollback code registry 2025-10-03 17:33:44 +07:00
3fe1156155 fix sort org 2025-10-03 17:30:08 +07:00
decb2433de fix script run retire this year 2025-10-03 17:14:20 +07:00
aadcec440e fix sort registry and add script update retire emp / position select 2025-10-03 17:04:05 +07:00
harid
ba9fea8403 no message 2025-10-03 16:57:07 +07:00
53e6d6fb48 fix script retire and fix bug filter registry retire 2025-10-03 16:44:43 +07:00
harid
5259b0beae ทดสอบรันสคริปเกษียณ 03/10 16.30 2025-10-03 16:24:32 +07:00
d113ac6dfe fix error sortBy default 2025-10-03 16:18:48 +07:00
d1ec7b76aa fix sort and add development api 2025-10-03 15:32:55 +07:00
682ff3a061 Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
* 'develop' of github.com:Frappet/bma-ehr-organization:
  fix
  sort

# Conflicts:
#	src/controllers/ProfileController.ts
2025-10-03 13:10:29 +07:00
b76895012c fix registry retire 2025-10-03 13:05:24 +07:00
f507bd8677 fix 2025-10-03 10:45:28 +07:00
0ef11abe2b Merge branch 'adiDev' into develop 2025-10-03 10:29:10 +07:00
0172aa9496 sort 2025-10-03 10:28:51 +07:00
4994c829b5 fix query registry retire & sort registry of employee 2025-10-02 18:42:14 +07:00
harid
b5823fdf28 emp 2025-10-02 18:17:19 +07:00
harid
7a25e8feda Fix Error #1815 2025-10-02 17:16:36 +07:00
3ae5e6a233 Merge branch 'develop' into adiDev 2025-10-02 15:19:15 +07:00
342c7dde67 comment เครียร์ตำแหน่งลูกจ้างหลังลบออกจากครองตำแหน่ง 2025-10-02 15:18:48 +07:00
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
b2fafc68e8 add retirement 2025-10-02 14:44:12 +07:00
5efb7346d6 Merge branch 'develop' into adiDev 2025-10-02 14:37:57 +07:00