From 486117242eea08f25c0d60be5a628eefab95f287 Mon Sep 17 00:00:00 2001
From: aikai <ZZL86tdd>
Date: Thu, 4 Jul 2024 19:08:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=BA=BA=E5=91=98=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attendance/AttendanceServiceImpl.java     | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java
index fcfdae28..97ebbdd0 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java
@@ -564,12 +564,12 @@ public class AttendanceServiceImpl implements AttendanceService {
     public Map<String, TeamAttendanceStatisticsByDayVO> teamStatisticsByDay(TeamAttendanceStatisticsByDayDTO dto) {
         Map<String, TeamAttendanceStatisticsByDayVO> map = new HashMap<>();
         //查询考勤组
-        AttendanceGroupDO attendanceGroupDO = attendanceGroupService.getGroup(dto.getGroupId());
+//        AttendanceGroupDO attendanceGroupDO = attendanceGroupService.getGroup(dto.getGroupId());
         // - 判断当前用户是否有权限查看
         // TODO: 2024/5/28 这里需要根据数据权限再过滤一下 ？ 或者说移动端不让看 有数据权限的直接在管理后台看
-        if (!dto.getUserId().equals(attendanceGroupDO.getUserId())) {
-            throw exception(NO_PERMISSION_TO_VIEW_CURRENT_ATTENDANCE_GROUP_INFORMATION);
-        }
+//        if (!dto.getUserId().equals(attendanceGroupDO.getUserId())) {
+//            throw exception(NO_PERMISSION_TO_VIEW_CURRENT_ATTENDANCE_GROUP_INFORMATION);
+//        }
         List<String> dateList = DateUtils.betweenDayList(DateUtil.beginOfMonth(dto.getTime()),
                 DateUtil.endOfMonth(dto.getTime()));
         List<AttendancePunchRecordDO> list = attendancePunchRecordMapper.selectList(new LambdaQueryWrapper<AttendancePunchRecordDO>()
@@ -617,12 +617,12 @@ public class AttendanceServiceImpl implements AttendanceService {
     public TeamAttendanceStatisticsByCycleVO tesmStatisticsByCycle(TeamAttendanceStatisticsByCycleDTO dto) {
         TeamAttendanceStatisticsByCycleVO vo = new TeamAttendanceStatisticsByCycleVO();
         //查询考勤组
-        AttendanceGroupDO attendanceGroupDO = attendanceGroupService.getGroup(dto.getGroupId());
+//        AttendanceGroupDO attendanceGroupDO = attendanceGroupService.getGroup(dto.getGroupId());
         // - 判断当前用户是否有权限查看
         // TODO: 2024/5/28 这里需要根据数据权限再过滤一下 ？ 或者说移动端不让看 有数据权限的直接在管理后台看
-        if (!dto.getUserId().equals(attendanceGroupDO.getUserId())) {
-            throw exception(NO_PERMISSION_TO_VIEW_CURRENT_ATTENDANCE_GROUP_INFORMATION);
-        }
+//        if (!dto.getUserId().equals(attendanceGroupDO.getUserId())) {
+//            throw exception(NO_PERMISSION_TO_VIEW_CURRENT_ATTENDANCE_GROUP_INFORMATION);
+//        }
         Date thisTime = new Date();
         Date beginTime = dto.getStartTime();
         Date endTime = dto.getEndTime();
@@ -791,13 +791,13 @@ public class AttendanceServiceImpl implements AttendanceService {
         List<AdminUserDO> userList = new ArrayList<>();
         List<Long> userIds = new ArrayList<>();
         if (dto.getMemberRange() == 1) {
-            userList = adminUserService.getAllList(CommonStatusEnum.ENABLE.getStatus(), null, userIds);
+            userList = adminUserService.getAllList(null, null, userIds);
         } else if (dto.getMemberRange() == 2) {
             // -- 获取考勤组ids
             userIds = attendanceGroupUserService.getUserIdsByGroupIds(dto.getTargetIds());
-            userList = adminUserService.getAllList(CommonStatusEnum.ENABLE.getStatus(), null, userIds);
+            userList = adminUserService.getAllList(null, null, userIds);
         } else {
-            userList = adminUserService.getAllList(CommonStatusEnum.ENABLE.getStatus(), null, dto.getTargetIds());
+            userList = adminUserService.getAllList(null, null, dto.getTargetIds());
         }
 
         // -- 统计