From d18112b88a1f9af0849f4013c9a5b7c901b03ce7 Mon Sep 17 00:00:00 2001 From: "MSI\\derek" Date: Tue, 21 Jan 2025 17:11:12 +0800 Subject: [PATCH] bug fix --- .../java/com/ffii/tsms/modules/data/service/StaffsService.kt | 3 +-- 1 file changed, 1 insertion(+), 2 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 d815198..7132867 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 @@ -377,9 +377,8 @@ open class StaffsService( val user = userRepository.findByUsernameAndDeletedFalse(staff.staffId).orElseThrow() user.apply { - locked = LocalDate.now().isAfter(staff.departDate) + locked = if (staff.departDate != null) { LocalDate.now().isAfter(staff.departDate) } else false } - users += user }