update filter for mail

(cherry picked from commit e69bf30653)

src/main/java/com/ffii/tsms/modules/common/mail/service/MailReminderService.kt

@@ -128,7 +128,7 @@ open class MailReminderService(
                 hours = it["hours"].toString().toDouble()
             )
         }
-        val staffs = staffRepository.findAllByEmployTypeAndDeletedFalseAndDepartDateIsNull(FULLTIME).filter { it.staffId != "A003" && it.staffId != "A004" && it.staffId != "B011" }.filter{ it.team.code != "HO"}
+        val staffs = staffRepository.findAllByEmployTypeAndDeletedFalseAndDepartDateIsNullAndTeamIdIsNotNull(FULLTIME).filter { it.staffId != "A003" && it.staffId != "A004" && it.staffId != "B011" }.filter{ it.team.code != "HO"}
         val teams = teamRepository.findAll().filter { team -> team.deleted == false
 //                && ( team.code == "WY" || team.code == "TW" || team.code == "CH" || team.code == "MN" || team.code == "MC" )
         }
@@ -202,7 +202,7 @@ open class MailReminderService(
                 hours = it["hours"].toString().toDouble()
             )
         }
-        val staffs = staffRepository.findAllByEmployTypeAndDeletedFalseAndDepartDateIsNull(FULLTIME).filter { it.staffId != "A003" && it.staffId != "A004" && it.staffId != "B011" }.filter{ it.team.code != "HO"}
+        val staffs = staffRepository.findAllByEmployTypeAndDeletedFalseAndDepartDateIsNullAndTeamIdIsNotNull(FULLTIME).filter { it.staffId != "A003" && it.staffId != "A004" && it.staffId != "B011" }.filter{ it.team.code != "HO"}
         val teams = teamRepository.findAll().filter { team -> team.deleted == false
 //                && ( team.code == "WY" || team.code == "TW" || team.code == "CH" || team.code == "MN" || team.code == "MC" )
         }
@@ -307,7 +307,7 @@ open class MailReminderService(
                 )
             }
 //            val timesheet = timesheetRepository.findByDeletedFalseAndRecordDateBetweenOrderByRecordDate(sevenDaysBefore, fourDaysBefore)
-            val staffs = staffRepository.findAllByEmployTypeAndDeletedFalseAndDepartDateIsNull(FULLTIME).filter { it.staffId != "A003" && it.staffId != "A004" && it.staffId != "B011" }.filter{ it.team.code != "HO"}
+            val staffs = staffRepository.findAllByEmployTypeAndDeletedFalseAndDepartDateIsNullAndTeamIdIsNotNull(FULLTIME).filter { it.staffId != "A003" && it.staffId != "A004" && it.staffId != "B011" }.filter{ it.team.code != "HO"}
             val staffIds: List<Long> = staffs.map { it.id as Long }
             val timesheetByIdAndRecord = timesheet.groupBy {
                 it.staffId to it.recordDate
@@ -382,7 +382,7 @@ open class MailReminderService(
             val timesheet = timesheetRepository.findByDeletedFalseAndRecordDateBetweenOrderByRecordDate(sevenDaysBefore,fourDaysBefore)
             // just getting my own staff record
             // change it back later
-            val staffs = staffRepository.findAllByEmployTypeAndDeletedFalseAndDepartDateIsNull(FULLTIME)
+            val staffs = staffRepository.findAllByEmployTypeAndDeletedFalseAndDepartDateIsNullAndTeamIdIsNotNull(FULLTIME)
             val staffIds: List<Long> = staffs.map { it.id as Long }
 
             val timesheetByIdAndRecord = timesheet.groupBy { it.staff?.id to it.recordDate }

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> findAllByEmployTypeAndDeletedFalseAndDepartDateIsNull(@Param("employType") String employType);
+    List<Staff> findAllByEmployTypeAndDeletedFalseAndDepartDateIsNullAndTeamIdIsNotNull(@Param("employType") String employType);
 
     Optional<List<Staff>> findAllByDeletedFalse();