aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormrfoxygmfr <mrfoxygmfr@sch9.ru>2025-05-07 00:59:25 +0300
committermrfoxygmfr <mrfoxygmfr@sch9.ru>2025-05-07 00:59:25 +0300
commitc98510467d88a017ba70bff9de059951f457c433 (patch)
tree79043c3ea5745fed7e689a4927c4957a1d0a9a7e
parent6e1fdefc67e150c14ffeb05e7d7fdcfcacddf8ad (diff)
fix(http): operations filter + unecessary debug prints
-rw-r--r--src/main/java/ru/mrfoxygmfr/warehouse_accounting/http/controllers/OperationsController.java4
-rw-r--r--src/main/java/ru/mrfoxygmfr/warehouse_accounting/http/controllers/PartnersController.java1
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));