From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期三, 16 四月 2025 19:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev
---
zhitan-system/src/main/java/com/zhitan/productoutput/services/impl/ProductOutputServiceImpl.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/zhitan-system/src/main/java/com/zhitan/productoutput/services/impl/ProductOutputServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/productoutput/services/impl/ProductOutputServiceImpl.java
index f2b6829..7a2329a 100644
--- a/zhitan-system/src/main/java/com/zhitan/productoutput/services/impl/ProductOutputServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/productoutput/services/impl/ProductOutputServiceImpl.java
@@ -101,6 +101,7 @@
wrapper.like(StringUtils.isNotEmpty(productOutput.getDataTime()),ProductOutput::getDataTime,productOutput.getDataTime());
wrapper.eq(StringUtils.isNotEmpty(productOutput.getProductType()),ProductOutput::getProductType,productOutput.getProductType());
wrapper.eq(StringUtils.isNotEmpty(productOutput.getNodeId()),ProductOutput::getNodeId,productOutput.getNodeId());
+ wrapper.eq(StringUtils.isNotEmpty(productOutput.getTimeType()),ProductOutput::getTimeType,productOutput.getTimeType());
wrapper.orderByDesc(ProductOutput::getCreateTime);
Page<ProductOutput> page = productOutputMapper.selectPage(new Page<ProductOutput>(pageNum, pageSize), wrapper);
return page;
--
Gitblit v1.9.3