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 588c7328..df12005e 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 @@ -146,10 +146,10 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS vo.setAttendanceGroup(attendanceGroup); //3.根据id查询区域信息 - Long areaId = vo.getAreaId(); +// Long areaId = vo.getAreaId(); //根据区域id查询出区域的详细信息 - AttendanceArea attendanceArea = attendanceAreaMapper.selectById(areaId); - vo.setAttendanceArea(attendanceArea); +// AttendanceArea attendanceArea = attendanceAreaMapper.selectById(areaId); +// vo.setAttendanceArea(attendanceArea); //4.查询班制信息 //判断当前考勤组的班制是固定班制还是排班制 diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceUserGroupServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceUserGroupServiceImpl.java index b7535a88..544bd8ce 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceUserGroupServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/AttendanceUserGroupServiceImpl.java @@ -208,11 +208,11 @@ public class AttendanceUserGroupServiceImpl implements IAttendanceUserGroupServi vo.setAttendanceGroup(attendanceGroup); - //3.根据id查询区域信息 - Long areaId = arrangement.getAreaId(); - //根据区域id查询出区域的详细信息 - AttendanceArea attendanceArea = attendanceAreaMapper.selectById(areaId); - vo.setAttendanceArea(attendanceArea); +// //3.根据id查询区域信息 +// Long areaId = arrangement.getAreaId(); +// //根据区域id查询出区域的详细信息 +// AttendanceArea attendanceArea = attendanceAreaMapper.selectById(areaId); +// vo.setAttendanceArea(attendanceArea); // 判断当前考勤组的班制是固定班制还是排班制 if (Objects.equals(attendanceGroup.getAttendanceType(), StatusConstant.FIXEDSCHEDULE)) {