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 a6462fd5..11457675 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 @@ -79,8 +79,12 @@ public class AttendanceArrangementServiceImpl implements IAttendanceArrangementS vo.setAttendanceGroup(attendanceGroup); //根据id查询排班人员信息 -// List userGroupList = userGroupMapper.selectList(Wrappers.lambdaQuery().eq(AttendanceUserGroup::getScheduleId, id)); List userGroupList = userGroupMapper.selectVoList(Wrappers.lambdaQuery().eq(AttendanceUserGroup::getScheduleId, id)); + //查询所有的用户信息 + userGroupList.forEach(userGroup -> { + SysUserVo sysUserVo = sysUserService.selectUserById(userGroup.getEmployeeId()); + userGroup.setSysUser(sysUserVo); + }); //将排班人员信息添加到排班信息中 vo.setUserGroupList(userGroupList); return vo;