From 19f324552d79aed6ec9bbc58c2f0fb9502648194 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 13 六月 2025 14:09:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/InStoreDetailServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/InStoreDetailServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/InStoreDetailServiceImpl.java
index 49fe595..0671d0a 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/InStoreDetailServiceImpl.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/InStoreDetailServiceImpl.java
@@ -40,9 +40,17 @@
if (StringUtils.isNotBlank(classifyId)) {
queryWrapper.eq("t2.id", classifyId);
}
+ String toolCode = query.get("toolCode");
+ if (StringUtils.isNotBlank(toolCode)) {
+ queryWrapper.like("t1.tool_code", toolCode);
+ }
+ String toolModel = query.get("toolModel");
+ if (StringUtils.isNotBlank(toolModel)) {
+ queryWrapper.like("t1.tool_mode", toolModel);
+ }
// 鎺掑簭鍐欐硶
List<OrderItem> orderItems = new ArrayList<>();
- orderItems.add(OrderItem.desc("t1.create_time"));
+ orderItems.add(OrderItem.desc("t.create_time"));
((Page<Map>) pageData).setOrders(orderItems);
}
return super.getBaseMapper().findPageList(pageData,queryWrapper);
--
Gitblit v1.9.3