diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementServiceImpl.java
index b11c8250..e14f152b 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementServiceImpl.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceArrangementServiceImpl.java
@@ -97,7 +97,7 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
         Page<AttendanceArrangementVo> attendanceArrangementVoPage = result.setRecords(result.getRecords().stream().map(vo -> {
             //根据当前日期查询在开始时间和结束时间之间的排班信息
             //从前端查询出来的当前日期，判断是否在排班时间内
-            if (bo.getCurrentDate().isAfter(vo.getStartDate()) && bo.getCurrentDate().isBefore(vo.getEndDate())) {
+            if ((bo.getCurrentDate().isAfter(vo.getStartDate()) || bo.getCurrentDate().isEqual(vo.getStartDate())) && (bo.getCurrentDate().isBefore(vo.getEndDate()) || bo.getCurrentDate().isEqual(vo.getEndDate()))) {
                 //1.查询人员表信息
                 //根据查询出来的result取出shceduleId
                 Long scheduleId = vo.getId();
@@ -436,6 +436,10 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS
         }
 
         judgeDate(bo, add);
+
+
+
+
         //取出当前新增的排班的id
         Long ArrangementId = add.getId();
         //用获取到的排班id向attendanceUserGroup表中插入数据