From 874dac1bb34cc7ef3b75f4c9306eb2a94f683f80 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 18 二月 2025 14:48:04 +0800
Subject: [PATCH] 兼容四期
---
src/main/java/com/zy/asrs/controller/OrderController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 18ae614..920a63a 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -226,6 +226,12 @@
@RequestParam Map<String, Object> param) {
EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
excludeTrash(param);
+ Object o = param.get("orderType");
+ if (o != null) {
+ String[] split = o.toString().split(",");
+ wrapper.in("source", split);
+ param.remove("orderType");
+ }
convert(param, wrapper);
// List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
// List<Long> docIds = new ArrayList<>();
@@ -234,13 +240,11 @@
// docIds.add(pakin.getDocId());
// }
// }
- Object o = param.get("orderType");
- if (o != null) {
- wrapper.in("source", o);
- }
+
return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
+
@RequestMapping(value = "/order/detls/pakin")
@ManagerAuth
public R orderDetlsIn(@RequestParam(defaultValue = "1") Integer curr,
--
Gitblit v1.9.1