From 6f0cee21409ccd21a762fb3a3a46cec06f65b503 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 25 十二月 2024 14:31:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v4' into master-v4
---
src/main/resources/mapper/statisticsAnalysis/SalesStatisticsAnalysisMapper.xml | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/statisticsAnalysis/SalesStatisticsAnalysisMapper.xml b/src/main/resources/mapper/statisticsAnalysis/SalesStatisticsAnalysisMapper.xml
index 099e184..c2334f9 100644
--- a/src/main/resources/mapper/statisticsAnalysis/SalesStatisticsAnalysisMapper.xml
+++ b/src/main/resources/mapper/statisticsAnalysis/SalesStatisticsAnalysisMapper.xml
@@ -69,7 +69,9 @@
AND oi.station_id = #{dto.stationId}
</if>
<if test="dto.flowerCategory != null">
- AND f.category = #{dto.flowerCategory}
+ AND ( f.category = #{dto.flowerCategory} or f.category in (
+ select id from t_flower_category where parent_id = #{dto.flowerCategory}
+ ))
</if>
<if test="dto.flowerLevel != null and dto.flowerLevel != ''">
AND oi.flower_level = #{dto.flowerLevel}
--
Gitblit v1.9.3