|
@@ -72,7 +72,7 @@ public class WebsitPartsSalesLogic {
|
|
|
public IPage<PartsSalesOrderBean> appList(String identity, String salesId, PartsOrderStatusEnum status, PartsPushFlagEnum pushFlag,
|
|
|
String partsNumber, Integer pageNo, Integer pageSize) {
|
|
|
CurrentCompanyWechat wechat = commonLogic.getCurrentCompanyWechat();
|
|
|
- IPage<PartsSalesOrderBean> page = materialMapper.appSalesList(new Page(pageNo, pageSize), wechat.getCompanyWechatId(), identity, salesId, status.getKey(), pushFlag.getKey(), partsNumber);
|
|
|
+ IPage<PartsSalesOrderBean> page = materialMapper.appSalesList(new Page(pageNo, pageSize), wechat.getCompanyWechatId(), identity, salesId, Objects.isNull(status) ? null : status.getKey(), Objects.isNull(pushFlag) ? null : pushFlag.getKey(), partsNumber);
|
|
|
|
|
|
List<PartsSalesOrderBean> partsSalesOrderBeanList = new ArrayList<>();
|
|
|
for (Object record : page.getRecords()) {
|