Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/busi/MesPullingOrderInfoService.java

@@ -275,11 +275,13 @@ public class MesPullingOrderInfoService implements IMesPullingOrderInfoService {
 
             if (!CollectionUtils.isEmpty(pullingOrderInfoList)) {
                 list = (pullingOrderInfoList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getCarModelCode()))).map(MesPullingOrderInfo::getCarModelCode).collect(Collectors.toList())).stream().filter(o -> !StringUtils.isEmpty(o)).distinct().collect(Collectors.toList());
-                packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
-                DdlPreparedPack.getInPackList(list, MesPcnExtConstWords.CAR_MODEL_CODE, packBean);
-                List<MesCustomerCarModel> customerCarModelList = carModelRepository.findByHqlWhere(packBean);
-                customerCarModelMap = CollectionUtils.isEmpty(customerCarModelList) ? null :
-                        customerCarModelList.stream().filter(o -> null != o).collect(Collectors.groupingBy(MesCustomerCarModel::getCarModelCode));
+                if (!CollectionUtils.isEmpty(list)) {
+                    packBean = DdlPackBean.getDdlPackBean(bean.getOrganizeCode());
+                    DdlPreparedPack.getInPackList(list, MesPcnExtConstWords.CAR_MODEL_CODE, packBean);
+                    List<MesCustomerCarModel> customerCarModelList = carModelRepository.findByHqlWhere(packBean);
+                    customerCarModelMap = CollectionUtils.isEmpty(customerCarModelList) ? null :
+                            customerCarModelList.stream().filter(o -> null != o).collect(Collectors.groupingBy(MesCustomerCarModel::getCarModelCode));
+                }
             }
 
             String key;