From 08c96e4b797573fd64b42a52a2f9b9805d59d3e3 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 07 四月 2024 14:03:54 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageParam.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageParam.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageParam.java
index 915624b..0ae7e51 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageParam.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageParam.java
@@ -157,7 +157,17 @@
}
public Map<String, Object> pickOutMap() {
- return where.getMap();
+ return pickOutMap(false);
+ }
+
+ public Map<String, Object> pickOutMap(boolean mergeCondition) {
+ Map<String, Object> map = where.getMap();
+ if (mergeCondition) {
+ if (!Cools.isEmpty(where.getCondition())) {
+ map.put("condition", where.getCondition());
+ }
+ }
+ return map;
}
}
--
Gitblit v1.9.1