From b9b1a775a9633a34130944d7fdbe9b9ba860aa8e Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 11 八月 2026 17:35:00 +0800
Subject: [PATCH] fix: 清理配置文件
---
src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java
index 14d522c..48c6745 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/PersonalAttendanceRecordsServiceImpl.java
@@ -72,8 +72,7 @@
List<PersonalShift> personalShifts = personalShiftMapper.selectList(Wrappers.<PersonalShift>lambdaQuery()
.eq(PersonalShift::getStaffOnJobId, staffOnJob.getId())
.eq(PersonalShift::getWorkTime, currentDate.atStartOfDay())
- .isNotNull(PersonalShift::getPersonalAttendanceLocationConfigId)
- .ne(PersonalShift::getPersonalAttendanceLocationConfigId, 999));
+ .isNotNull(PersonalShift::getPersonalAttendanceLocationConfigId));
if (CollectionUtil.isEmpty(personalShifts)){
throw new BaseException("褰撳墠鐢ㄦ埛褰撳ぉ娌℃湁鎺掔彮鏁版嵁");
}
@@ -231,15 +230,12 @@
List<PersonalShift> personalShifts = personalShiftMapper.selectList(Wrappers.<PersonalShift>lambdaQuery()
.eq(PersonalShift::getStaffOnJobId, staffOnJob.getId())
.eq(PersonalShift::getWorkTime, currentDate.atStartOfDay())
- .isNotNull(PersonalShift::getPersonalAttendanceLocationConfigId)
- .ne(PersonalShift::getPersonalAttendanceLocationConfigId, 999));
+ .isNotNull(PersonalShift::getPersonalAttendanceLocationConfigId));
if (CollectionUtil.isNotEmpty(personalShifts)){
PersonalAttendanceLocationConfig personalAttendanceLocationConfig = personalAttendanceLocationConfigMapper.selectById(personalShifts.get(0).getPersonalAttendanceLocationConfigId());
- if (personalAttendanceLocationConfig != null) {
- resultDto.setStartAt(personalAttendanceLocationConfig.getStartAt());
- resultDto.setEndAt(personalAttendanceLocationConfig.getEndAt());
- resultDto.setShift(personalAttendanceLocationConfig.getShift());
- }
+ resultDto.setStartAt(personalAttendanceLocationConfig.getStartAt());
+ resultDto.setEndAt(personalAttendanceLocationConfig.getEndAt());
+ resultDto.setShift(personalAttendanceLocationConfig.getShift());
}
return resultDto;
}
--
Gitblit v1.9.3