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)