diff options
Diffstat (limited to 'src/main/java')
2 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/ru/mrfoxygmfr/warehouse_accounting/http/controllers/OperationsController.java b/src/main/java/ru/mrfoxygmfr/warehouse_accounting/http/controllers/OperationsController.java index a49cf20..d5a4a7f 100644 --- a/src/main/java/ru/mrfoxygmfr/warehouse_accounting/http/controllers/OperationsController.java +++ b/src/main/java/ru/mrfoxygmfr/warehouse_accounting/http/controllers/OperationsController.java @@ -36,11 +36,11 @@ public class OperationsController { spec = spec.and(OperationSpecs.operationStatusEqual(status)); model.addAttribute("operationStatusFilter", status.toString()); } - if (productName != null) { + if (productName != null && !productName.isEmpty()) { spec = spec.and(OperationSpecs.operationProductsContainsLike(productName)); model.addAttribute("operationProductNameFilter", productName); } - if (partnerName != null) { + if (partnerName != null && !partnerName.isEmpty()) { spec = spec.and(OperationSpecs.operationPartnerNameLike(partnerName)); model.addAttribute("operationPartnerNameFilter", partnerName); } diff --git a/src/main/java/ru/mrfoxygmfr/warehouse_accounting/http/controllers/PartnersController.java b/src/main/java/ru/mrfoxygmfr/warehouse_accounting/http/controllers/PartnersController.java index dd62439..50f0265 100644 --- a/src/main/java/ru/mrfoxygmfr/warehouse_accounting/http/controllers/PartnersController.java +++ b/src/main/java/ru/mrfoxygmfr/warehouse_accounting/http/controllers/PartnersController.java @@ -31,7 +31,6 @@ public class PartnersController { if (type != null) { spec = spec.and(PartnerSpecs.partnerTypeEqual(type)); model.addAttribute("partnerTypeFilter", type.toString()); - System.out.println(model.getAttribute("partnerTypeFilter") == "ISSUER"); } if (taxNumber != null && !taxNumber.isEmpty()) { spec = spec.and(PartnerSpecs.partnerTaxNumberLike(taxNumber)); |