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

master #3

Merged
bichangxiong merged 5 commits from master into prod 2025-08-29 18:47:07 +08:00
Conversation 0 Commits 5 Files Changed 3 +1 -1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ce0c4b201c - Show all commits

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

@@ -245,7 +245,7 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
.le(AttendanceUserGroup::getStartDate, today)
.ge(AttendanceUserGroup::getEndDate, today)
.eq(AttendanceUserGroup::getDeptId, serviceWorkOrders.getCreateDept())
.orderByAsc(AttendanceUserGroup::getCreateTime)
.orderByAsc(AttendanceUserGroup::getStartDate)
);
Assert.isTrue(CollUtil.isNotEmpty(attendanceUserGroups), "暂无排班人员");
// 缓存当天排班数据（假设当天不会变）