diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java
index 623e7b85..624c7617 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/ServiceWorkOrdersServiceImpl.java
@@ -244,6 +244,7 @@ public class ServiceWorkOrdersServiceImpl implements IServiceWorkOrdersService {
                 new LambdaQueryWrapper<AttendanceUserGroup>()
                     .le(AttendanceUserGroup::getStartDate, today)
                     .ge(AttendanceUserGroup::getEndDate, today)
+                    .eq(AttendanceUserGroup::getDeptId, serviceWorkOrders.getCreateDept())
                     .orderByAsc(AttendanceUserGroup::getCreateTime)
             );
             Assert.isTrue(CollUtil.isNotEmpty(attendanceUserGroups), "暂无排班人员");
diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/cleanOrderImpl/CleanOrderServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/cleanOrderImpl/CleanOrderServiceImpl.java
index 6b7e2831..2a03af34 100644
--- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/cleanOrderImpl/CleanOrderServiceImpl.java
+++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/cleanOrderImpl/CleanOrderServiceImpl.java
@@ -118,10 +118,11 @@ public class CleanOrderServiceImpl implements ICleanOrderService {
         return baseMapper.selectVoList(lqw);
     }
 
-    private LambdaQueryWrapper<CleanOrder> buildQueryWrapper(CleanOrderBo bo) {
+    private LambdaQueryWrapper<CleanOrder>buildQueryWrapper(CleanOrderBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<CleanOrder> lqw = Wrappers.lambdaQuery();
-        lqw.orderByAsc(CleanOrder::getId);
+        lqw.orderByDesc(CleanOrder::getCreateTime)
+            .orderByDesc(CleanOrder::getUpdateTime);
 //        lqw.eq(StringUtils.isNotBlank(bo.getLocation()), CleanOrder::getLocation, bo.getLocation());
 //        lqw.eq(StringUtils.isNotBlank(bo.getArea()), CleanOrder::getArea, bo.getArea());