From ef080fcc58a405bd2953b342e25759ce81937e20 Mon Sep 17 00:00:00 2001 From: "MSI\\2Fi" Date: Thu, 12 Dec 2024 11:36:39 +0800 Subject: [PATCH] Update username when editing the staff --- .../tsms/modules/data/service/StaffsService.kt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt b/src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt index ac09dd0..d815198 100644 --- a/src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt +++ b/src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt @@ -305,14 +305,18 @@ open class StaffsService( this.department = department } - if (req.departDate != null) { - val user = userRepository.findByUsernameAndDeletedFalse(req.staffId).orElseThrow() - user.apply { - locked = LocalDate.now().isAfter(req.departDate) + val user = userRepository.findByUsernameAndDeletedFalse(req.staffId).orElseThrow() + user.apply { + username = req.staffId + locked = if (req.departDate != null) { + LocalDate.now().isAfter(req.departDate) + } else { + false } - - userRepository.save(user) } + + userRepository.save(user) + // salaryEffectiveService.saveSalaryEffective(staff.id!!, salary.salaryPoint.toLong()) if (req.salaryEffectiveInfo != null && req.delSalaryEffectiveInfo != null) { salaryEffectiveService.updateSalaryEffective(staff.id!!, req.salaryEffectiveInfo.sortedBy { it.date }, req.delSalaryEffectiveInfo)