|
@@ -402,7 +402,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
|
|
Integer status = param.getStatus();
|
|
Integer status = param.getStatus();
|
|
Page<OmsOrder> page = this.lambdaQuery()
|
|
Page<OmsOrder> page = this.lambdaQuery()
|
|
.eq(OmsOrder::getUserId, userId)
|
|
.eq(OmsOrder::getUserId, userId)
|
|
- .eq(OmsOrder::getStatus, status)
|
|
|
|
|
|
+ .eq(StringUtils.notEmpty(status),OmsOrder::getStatus, status)
|
|
.orderByDesc(OmsOrder::getCreateTime)
|
|
.orderByDesc(OmsOrder::getCreateTime)
|
|
.page(DatabaseContextHolder.page(param.getPaging()));
|
|
.page(DatabaseContextHolder.page(param.getPaging()));
|
|
Pagination<OmsOrderDTO> pagination = DatabaseContextHolder.pagination(page, OrderCopier.INSTANCE::copying);
|
|
Pagination<OmsOrderDTO> pagination = DatabaseContextHolder.pagination(page, OrderCopier.INSTANCE::copying);
|