订单分页调整

sd-business/src/main/java/com/sd/business/service/order/impl/OrderServiceImpl.java

@@ -170,10 +170,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
                 .or(r -> r.eq("o", OrderInfo::getSource, 1))
         );
 
-        List<Long> detpIdList = sysUserService.getDetpIdListByUserId(SecurityUtils.getUserId());
-        if (!detpIdList.isEmpty()) {
-            wrapper.in("o", OrderInfo::getDepartmentId, detpIdList);
-            wrapper.eq("o", OrderInfo::getCreateUser, SecurityUtils.getUserId());
+        if (dto.getDepartmentId() == null) {
+            List<Long> detpIdList = sysUserService.getDetpIdListByUserId(SecurityUtils.getUserId());
+            if (!detpIdList.isEmpty()) {
+                wrapper.in("o", OrderInfo::getDepartmentId, detpIdList);
+                wrapper.eq("o", OrderInfo::getCreateUser, SecurityUtils.getUserId());
+            }
         }
 
         if (Objects.equals(dto.getLinkedStatementOfAccount(), 0)) {