update

src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java

@@ -408,11 +408,6 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
         if (StringUtils.isNotEmpty(param.getCustomerPhone())) {
             wrapper.like(OrderManage::getTelephone, param.getCustomerPhone());
         }
-        if (param.getCustomerId() != null) {
-            wrapper.and(wrapper2 -> wrapper.eq(OrderManage::getOrderUser, param.getCustomerId())
-                    .or()
-                    .eq(OrderManage::getPayUser, param.getCustomerId()));
-        }
         if (param.getDepartmentId() != null) {
             wrapper.eq(OrderManage::getDepartmentId, param.getDepartmentId());
         }
@@ -423,7 +418,11 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
             wrapper.ne(OrderManage::getStatus, OrderManage.STATUS_SYSTEM_UN_CHECK);
         }
         wrapper.ne(OrderManage::getStatus, OrderManage.STATUS_DELETED);
-
+        if (param.getCustomerId() != null) {
+            wrapper.and(wrapper2 -> wrapper.eq(OrderManage::getOrderUser, param.getCustomerId())
+                    .or()
+                    .eq(OrderManage::getPayUser, param.getCustomerId()));
+        }
         //noinspection unchecked
         wrapper.orderByDesc(OrderManage::getCreateTime);