From 4dc17f30c7ac7ad17a52a8bc313e03928500369e Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 29 八月 2023 14:49:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnasrs' into zjfnasrs

---
 src/main/java/com/zy/asrs/controller/LocMastController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index f096994..710ea2e 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -82,7 +82,7 @@
                 wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                 wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
             } else {
-                if (entry.getKey().equals("loc_type2")){
+                if (entry.getKey().equals("loc_type1")){
                     wrapper.eq(entry.getKey(), val);
                 }else {
                     wrapper.like(entry.getKey(), val);

--
Gitblit v1.9.1