From 1f4733e4adfde41cd09542d91cd17a2b6965a610 Mon Sep 17 00:00:00 2001 From: VVT789 <sdxt_0802@163.com> Date: 星期五, 18 四月 2025 16:37:04 +0800 Subject: [PATCH] Merge branch 'develop1.0' into wt_from_develop1.0 --- 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