diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverUnhandledController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverUnhandledController.java index c37f3c18..06f40958 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverUnhandledController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverUnhandledController.java @@ -108,6 +108,10 @@ public class SaDeliverUnhandledController extends BaseController { param.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList()); param.setVertexIdList(userAuthorityDTO.getVertexIdList()); param.setTeamList(userAuthorityDTO.getUserTeamList()); + // 兼容调换货产品 + if (CollectionUtil.isEmpty(param.getPkWaresList())) { + param.setPkWaresList(Collections.singletonList(0)); + } startPage(); List resultList = iSaOrderItemsService.queryDeliverUnhandledList(param, pkCountry); @@ -151,6 +155,10 @@ public class SaDeliverUnhandledController extends BaseController { param.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList()); param.setVertexIdList(userAuthorityDTO.getVertexIdList()); param.setTeamList(userAuthorityDTO.getUserTeamList()); + // 兼容调换货产品 + if (CollectionUtil.isEmpty(param.getPkWaresList())) { + param.setPkWaresList(Collections.singletonList(0)); + } List resultList = iSaOrderItemsService.queryDeliverUnhandledList(param, pkCountry);