查询列表中查询条件优化

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

@@ -135,11 +135,11 @@ public class DeliveryController {
                                 if (!StringUtils.isEmpty(jsonObjectDataArrival.getString("materialsName"))){
                                 if (!StringUtils.isEmpty(jsonObjectDataArrival.getString("materialsName"))){
                                     delivery.setMaterialName(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","发货仓库和到货仓库请选择不同的仓库!");
                                 }
                                 }
                             }
                             }
+                        }
                         //申请团队
                         //申请团队
                         delivery.setTeam(wallboxApply.getSupplierTeam());
                         delivery.setTeam(wallboxApply.getSupplierTeam());
                         Delivery deliveryInstallOrder=deliveryMapper.selectByInstallOrder(da.getInstallOrder());
                         Delivery deliveryInstallOrder=deliveryMapper.selectByInstallOrder(da.getInstallOrder());