by2025/SmartParks
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'prod' of http://47.109.37.87:3000/by2025/SmartParks
All checks were successful
Build and Push to Target Registry / 构建并推送镜像到目标仓库 (push) Successful in 13m13s
Details

Browse Source
This commit is contained in:
15683799673
2025-08-30 06:36:57 +08:00
parent 3c6595e591 97a3c106cb
commit fe8c5a76f3
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java
View File

@@ -243,7 +243,7 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
new LambdaQueryWrapper<AttendanceUserGroup>() new LambdaQueryWrapper<AttendanceUserGroup>()
.le(AttendanceUserGroup::getStartDate, today) .le(AttendanceUserGroup::getStartDate, today)
.ge(AttendanceUserGroup::getEndDate, today) .ge(AttendanceUserGroup::getEndDate, today)
.eq(AttendanceUserGroup::getDeptId, serviceWorkOrdersType.getCreateDept()) .eq(AttendanceUserGroup::getDeptId, serviceWorkOrdersType.getDeptId())
.orderByAsc(AttendanceUserGroup::getStartDate) .orderByAsc(AttendanceUserGroup::getStartDate)
); );
if (CollUtil.isEmpty(attendanceUserGroups)|| attendanceUserGroups.size() != attendanceUserGroupList.size()) { if (CollUtil.isEmpty(attendanceUserGroups)|| attendanceUserGroups.size() != attendanceUserGroupList.size()) {