소스 검색

签到打卡导出,支持根据用户id列表和月份导出

wang-hai-cheng 5 년 전
부모
커밋
830690ebfe
1개의 변경된 파일3개의 추가작업 그리고 1개의 파일을 삭제
  1. 3 1
      lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/service/AttendanceService.java

+ 3 - 1
lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/oa/service/AttendanceService.java

@@ -104,7 +104,9 @@ public class AttendanceService extends ServiceImpl<AttendanceMapper, Attendance>
     }
 
     public void export(AttendanceRequest attendanceRequest, HttpServletResponse response) {
-        attendanceRequest.setUserIds(this.baseMapper.selectCompanyUserIdsByMtCompanyId(attendanceRequest.getMtCompanyId()));
+        if (attendanceRequest.getUserIds()==null||attendanceRequest.getUserIds().isEmpty()) {
+            attendanceRequest.setUserIds(this.baseMapper.selectCompanyUserIdsByMtCompanyId(attendanceRequest.getMtCompanyId()));
+        }
         attendanceRequest.setUserId(null);
         List<AttendanceResponse> attendanceResponses = this.listByIdList(attendanceRequest);
         Validate.notNull(attendanceResponses, ValuePool.ATTEND_MISSING);