diff --git a/src/main/java/com/ffii/tsms/modules/common/mail/service/MailReminderService.kt b/src/main/java/com/ffii/tsms/modules/common/mail/service/MailReminderService.kt
index ce02db3..427ff74 100644
--- a/src/main/java/com/ffii/tsms/modules/common/mail/service/MailReminderService.kt
+++ b/src/main/java/com/ffii/tsms/modules/common/mail/service/MailReminderService.kt
@@ -119,7 +119,7 @@ open class MailReminderService(
         }
 
         val timesheet = timesheetRepository.findByDeletedFalseAndRecordDateBetweenOrderByRecordDate(filteredLastMonthDays.first(),filteredLastMonthDays.last())
-        val staffs = staffRepository.findAllByEmployTypeAndDeletedFalse(FULLTIME)
+        val staffs = staffRepository.findAllByEmployTypeAndDeletedFalseAndDepartDateIsNull(FULLTIME)
         val teams = teamRepository.findAll().filter { team -> team.deleted == false }
 
         for (team in teams) {
@@ -177,7 +177,7 @@ open class MailReminderService(
 
         //get data
         val timesheet = timesheetRepository.findByDeletedFalseAndRecordDateBetweenOrderByRecordDate(firstDay, today)
-        val staffs = staffRepository.findAllByEmployTypeAndDeletedFalse(FULLTIME)
+        val staffs = staffRepository.findAllByEmployTypeAndDeletedFalseAndDepartDateIsNull(FULLTIME)
         val teams = teamRepository.findAll().filter { team -> team.deleted == false }
 
         val dateList = generateSequence(firstDay) { it.plusDays(1) }
@@ -268,7 +268,7 @@ open class MailReminderService(
             }
 
             val timesheet = timesheetRepository.findByDeletedFalseAndRecordDateBetweenOrderByRecordDate(sevenDaysBefore, fourDaysBefore)
-            val staffs = staffRepository.findAllByEmployTypeAndDeletedFalse(FULLTIME) // FT? FT? etc
+            val staffs = staffRepository.findAllByEmployTypeAndDeletedFalseAndDepartDateIsNull(FULLTIME) // FT? FT? etc
             val staffIds: List<Long> = staffs.map { it.id as Long }
 
             val timesheetByIdAndRecord = timesheet.groupBy { it.staff?.id to it.recordDate }
@@ -338,7 +338,7 @@ open class MailReminderService(
             val timesheet = timesheetRepository.findByDeletedFalseAndRecordDateBetweenOrderByRecordDate(sevenDaysBefore,fourDaysBefore)
             // just getting my own staff record
             // change it back later
-            val staffs = staffRepository.findAllByEmployTypeAndDeletedFalse(FULLTIME)
+            val staffs = staffRepository.findAllByEmployTypeAndDeletedFalseAndDepartDateIsNull(FULLTIME)
             val staffIds: List<Long> = staffs.map { it.id as Long }
 
             val timesheetByIdAndRecord = timesheet.groupBy { it.staff?.id to it.recordDate }
diff --git a/src/main/java/com/ffii/tsms/modules/data/entity/StaffRepository.java b/src/main/java/com/ffii/tsms/modules/data/entity/StaffRepository.java
index 890f3d5..2750a7f 100644
--- a/src/main/java/com/ffii/tsms/modules/data/entity/StaffRepository.java
+++ b/src/main/java/com/ffii/tsms/modules/data/entity/StaffRepository.java
@@ -24,7 +24,7 @@ public interface StaffRepository extends AbstractRepository<Staff, Long> {
     Optional<Staff> findByUserId(@Param("userId") Long userId);
     Optional<List<Staff>> findAllByTeamIdAndDeletedFalse(Long id);
 
-    List<Staff> findAllByEmployTypeAndDeletedFalse(@Param("employType") String employType);
+    List<Staff> findAllByEmployTypeAndDeletedFalseAndDepartDateIsNull(@Param("employType") String employType);
 
     Optional<List<Staff>> findAllByDeletedFalse();