From db851c5aafc3727dcb8d56f9516a478d6cc311c3 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 23 十月 2023 17:19:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocMastController.java | 11 ++++++++++-
1 files changed, 10 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 d2d4f7d..df6f1bc 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -68,16 +68,25 @@
}
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ boolean sign = false;
for (Map.Entry<String, Object> entry : map.entrySet()){
String val = String.valueOf(entry.getValue());
if (val.contains(RANGE_TIME_LINK)){
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
- } else {
+ } else if (entry.getKey().equals("loc_no")){
wrapper.like(entry.getKey(), val);
+ } else {
+ if (entry.getKey().equals("loc_type1")){
+ sign=true;
+ }
+ wrapper.eq(entry.getKey(), val);
}
}
+ if (sign){
+ wrapper.and().ne("loc_sts","Y");
+ }
}
@RequestMapping(value = "/locMast/add/auth")
--
Gitblit v1.9.1