do not notify staffstatus records of staff without employee flag

phoenixctms · Feb 2, 2024 · 26c53fa · 26c53fa
1 parent 1d36d50
commit 26c53fa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/core/src/main/java/org/phoenixctms/ctsms/service/shared/ToolsServiceImpl.java b/core/src/main/java/org/phoenixctms/ctsms/service/shared/ToolsServiceImpl.java
@@ -1129,7 +1129,8 @@ protected long handlePrepareNotifications(Long departmentId) throws Exception {
 				}
 			}
 		}
-		Iterator<StaffStatusEntry> staffStatusIt = this.getStaffStatusEntryDao().findStaffStatus(CommonUtil.dateToTimestamp(today), null, departmentId, null, false, null, null)
+		Iterator<StaffStatusEntry> staffStatusIt = this.getStaffStatusEntryDao()
+				.findStaffStatus(CommonUtil.dateToTimestamp(today), null, departmentId, null, false, true, null, null)
 				.iterator();
 		while (staffStatusIt.hasNext()) {
 			StaffStatusEntry staffStatusEntry = staffStatusIt.next();

diff --git a/core/src/main/java/org/phoenixctms/ctsms/util/ServiceUtil.java b/core/src/main/java/org/phoenixctms/ctsms/util/ServiceUtil.java
@@ -4663,7 +4663,7 @@ public static void populateShiftDurationSummary(boolean trialBreakDown, ShiftDur
 					durationSummaryDetail.setStaffStatusEntryDuration(0);
 					if (!trialBreakDown && staff != null) {
 						Iterator<StaffStatusEntry> statusEntryIt = staffStatusEntryDao.findByStaffInterval(staff.getId(), CommonUtil.dateToTimestamp(summary.getStart()),
-								CommonUtil.dateToTimestamp(summary.getStop()), false, null, false).iterator();
+								CommonUtil.dateToTimestamp(summary.getStop()), false, null, null, false).iterator();
 						while (statusEntryIt.hasNext()) {
 							StaffStatusEntry statusEntry = statusEntryIt.next();
 							Date start = statusEntry.getStart();