Merge branch 'liweidong'

24 hours ago · f7800ae9e1
parent e40024f5c4 3c97e2b292
commit f7800ae9e1
1 changed files with 5 additions and 1 deletions
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java
@ -153,7 +153,11 @@ public class YieldOrderServiceImpl extends BaseServiceImpl<YieldOrderMapper, Yie

    @Override
    public IPage<YieldOrder> selectPage(IPage<YieldOrder> page, YieldOrderDto entity) {
-        List<YieldOrder> dataList = baseMapper.selectPage(page, entity, null);
+        //烧结 热表订单
+        List<YieldOrderEnum> yieldTypeList = new ArrayList<>();
+        yieldTypeList.add(YieldOrderEnum.getEnum(entity.getYieldType()));
+
+        List<YieldOrder> dataList = baseMapper.selectPage(page, entity, yieldTypeList);
        return page.setRecords(dataList);
    }