From a02864c00330b987a42827dc99c1ba3a66e72143 Mon Sep 17 00:00:00 2001 From: dy <2389062315@qq.com> Date: Tue, 2 Sep 2025 15:36:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AttendanceArrangementServiceImpl.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceArrangementServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceArrangementServiceImpl.java index 44265a96..03ff3acd 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceArrangementServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/attendanceImpl/AttendanceArrangementServiceImpl.java @@ -101,14 +101,14 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS //将排班人员信息添加到排班信息中 vo.setUserGroupList(userGroupList); -// //4.根据id查询区域信息 -// List arrangementAreaList = attendanceArrangementAreaMapper.selectList(Wrappers.lambdaQuery().eq(AttendanceArrangementArea::getShceduleId, id)); -// //过滤出排班的区域id -// List areaIdList = arrangementAreaList.stream().map(AttendanceArrangementArea::getAreaId).collect(Collectors.toList()); -// //根据区域id查询出区域信息 -// List areaList = attendanceAreaMapper.selectList(Wrappers.lambdaQuery().in(AttendanceArea::getId, areaIdList)); -// //6.将区域信息添加到排班信息中 -// vo.setAreaList(areaList); + //4.根据id查询区域信息 + List arrangementAreaList = attendanceArrangementAreaMapper.selectList(Wrappers.lambdaQuery().eq(AttendanceArrangementArea::getShceduleId, id)); + //过滤出排班的区域id + List areaIdList = arrangementAreaList.stream().map(AttendanceArrangementArea::getAreaId).collect(Collectors.toList()); + //根据区域id查询出区域信息 + List areaList = attendanceAreaMapper.selectList(Wrappers.lambdaQuery().in(AttendanceArea::getId, areaIdList)); + //6.将区域信息添加到排班信息中 + vo.setAreaList(areaList); return vo; }