From 1abab7427d11c1155aad4c1ae92cc385ae801d35 Mon Sep 17 00:00:00 2001
From: "DESKTOP\\derek" <abc@gmail.com>
Date: Mon, 17 Feb 2025 17:03:15 +0800
Subject: [PATCH] update filter for mail

(cherry picked from commit e69bf306531f5a16e55df82f433999010c3d3344)
---
 .../modules/common/mail/service/MailReminderService.kt    | 8 ++++----
 .../ffii/tsms/modules/data/entity/StaffRepository.java    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

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 83749d9..5cce160 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
@@ -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 }
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 2750a7f..fed8675 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> findAllByEmployTypeAndDeletedFalseAndDepartDateIsNull(@Param("employType") String employType);
+    List<Staff> findAllByEmployTypeAndDeletedFalseAndDepartDateIsNullAndTeamIdIsNotNull(@Param("employType") String employType);
 
     Optional<List<Staff>> findAllByDeletedFalse();