diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java
index 6e9a839..158d2db 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceGroupServiceImpl.java
@@ -90,26 +90,10 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService {
             List<Long> shiftIds = weeksetShifts.stream().map(AttendanceWeeksetShift::getShiftId).toList();
             //2.5根据shiftId查询出班次表
             List<AttendanceShift> shifts = attendanceShiftMapper.selectList(Wrappers.<AttendanceShift>lambdaQuery().in(AttendanceShift::getId, shiftIds));
-
-
-//            //2.5根据班次id查询出班次表
-//            List<AttendanceShift> shifts = attendanceShiftMapper.selectList(Wrappers.<AttendanceShift>lambdaQuery().in(AttendanceShift::getId, weeksetShiftIds));
             //2.6将查询后的数据封装到attendanceGroupVo中
             vo.setAttendanceList(shifts);
             vo.setScheduleCycleList(scheduleCycles);
 
-
-//            List<AttendanceWeekSet> weekSets = weekSetMapper.selectList(Wrappers.<AttendanceWeekSet>lambdaQuery().eq(AttendanceWeekSet::getGroupId, id));
-//            //2.2根据id参数取出所有考勤天数id
-//            List<Long> weekSetIds = weekSets.stream().map(AttendanceWeekSet::getId).toList();
-//            //2.3根据天数id查询出中间表
-//            List<AttendanceScheduleCycle> scheduleCycles = attendanceScheduleCycleMapper.selectList(Wrappers.<AttendanceScheduleCycle>lambdaQuery().in(AttendanceScheduleCycle::getGroupId, weekSetIds));
-//            //2.4根据中间表的班次id查询出班次表id
-//            List<Long> scheduleCycleIds = scheduleCycles.stream().map(AttendanceScheduleCycle::getId).toList();
-//            //2.5根据班次id查询出班次表
-//            List<AttendanceShift> shifts = attendanceShiftMapper.selectList(Wrappers.<AttendanceShift>lambdaQuery().in(AttendanceShift::getId, scheduleCycleIds));
-//            //2.6将查询后的数据封装到attendanceGroupVo中
-//            vo.setAttendanceList(shifts);
         }
 
         //根据id查询attendance_clock_date表
@@ -230,6 +214,7 @@ public class AttendanceGroupServiceImpl implements IAttendanceGroupService {
                     AttendanceScheduleCycle attendanceScheduleCycle = new AttendanceScheduleCycle();
                     attendanceScheduleCycle.setGroupId(add.getId());
                     attendanceScheduleCycle.setDayNumber(num.getDayNumber());
+                    attendanceScheduleCycle.setShiftId(num.getShiftId());
                     attendanceScheduleCycleMapper.insert(attendanceScheduleCycle);
                     //获取周期表的id
                     Long scheduleId = attendanceScheduleCycle.getId();