|
@@ -79,10 +79,8 @@ public class DataStHistoryServiceImpl extends AbstractCrudService<DataStHistoryM
|
|
|
} else if (pickupStatus == 1) {
|
|
|
queryWrapper.eq(DataStHistory::getPickupStatus, 1);//已取件
|
|
|
}
|
|
|
- }else {
|
|
|
- queryWrapper.orderByAsc(DataStHistory::getPickupStatus);
|
|
|
}
|
|
|
- //pickupStatus为空就查询所有包裹信息
|
|
|
+ queryWrapper.orderByAsc(DataStHistory::getPickupStatus);//pickupStatus为空就查询所有包裹信息
|
|
|
page = this.page(page,queryWrapper);
|
|
|
if(page.getRecords().isEmpty()) {
|
|
|
throw new BusinessException("暂无包裹信息");
|