查询列表中查询条件优化

src/main/java/com/starcharge/wios/controller/DeliveryController.java

@@ -129,10 +129,12 @@ public class DeliveryController {
                             String jsonArrival = HttpClientUtils.post(detailUrl,paramArrival,"UTF-8", "UTF-8");
                             String jsonArrival = HttpClientUtils.post(detailUrl,paramArrival,"UTF-8", "UTF-8");
                             JSONObject jsonObjectArrival=JSONObject.parseObject(jsonArrival);
                             JSONObject jsonObjectArrival=JSONObject.parseObject(jsonArrival);
                             String dataArrival=jsonObjectArrival.getString("data");
                             String dataArrival=jsonObjectArrival.getString("data");
-                            JSONObject jsonObjectDataArrival=JSONObject.parseObject(dataArrival);
-                            //物料名称
-                            if (!StringUtils.isEmpty(jsonObjectDataArrival.getString("materialsName"))){
-                                delivery.setMaterialName(jsonObjectDataArrival.getString("materialsName"));
+                            if (!StringUtils.isEmpty(dataArrival)){
+                                JSONObject jsonObjectDataArrival=JSONObject.parseObject(dataArrival);
+                                //物料名称
+                                if (!StringUtils.isEmpty(jsonObjectDataArrival.getString("materialsName"))){
+                                    delivery.setMaterialName(jsonObjectDataArrival.getString("materialsName"));
+                                }
                             }
                             }
                             if (wallboxApply.getReceiverWarehouseId().equals(da.getWarehouseId())){
                             if (wallboxApply.getReceiverWarehouseId().equals(da.getWarehouseId())){
                                 throw new ServiceException("400","发货仓库和到货仓库请选择不同的仓库!");
                                 throw new ServiceException("400","发货仓库和到货仓库请选择不同的仓库!");