From 99f77afaaee87c3b9d7a5e48862908b72a947f7b Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期五, 17 一月 2025 08:59:55 +0800
Subject: [PATCH] fix:修改密码

---
 src/main/resources/mapper/statisticsAnalysis/FlowerMaterialMapper.xml |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mapper/statisticsAnalysis/FlowerMaterialMapper.xml b/src/main/resources/mapper/statisticsAnalysis/FlowerMaterialMapper.xml
index 6da77be..67746bd 100644
--- a/src/main/resources/mapper/statisticsAnalysis/FlowerMaterialMapper.xml
+++ b/src/main/resources/mapper/statisticsAnalysis/FlowerMaterialMapper.xml
@@ -125,15 +125,18 @@
             ))
 
         </if>
-        <if test="dto.flowerStatus != null and dto.flowerStatus != ''">
-            <if test="dto.flowerStatus == 'OFF'">
-                AND f.status IN ('OFF', 'FORCE_OFF')
-            </if>
-            <if test="dto.flowerStatus != 'OFF'">
-                AND f.status = #{dto.flowerStatus}
-            </if>
-        </if>
+<!--        <if test="dto.flowerStatus != null and dto.flowerStatus != ''">-->
+<!--            <if test="dto.flowerStatus == 'OFF'">-->
+<!--                AND f.status IN ('OFF', 'FORCE_OFF')-->
+<!--            </if>-->
+<!--            <if test="dto.flowerStatus != 'OFF'">-->
+<!--                AND f.status = #{dto.flowerStatus}-->
+<!--            </if>-->
+<!--        </if>-->
 
+        <if test="dto.flowerStatus != null and dto.flowerStatus != ''">
+            AND f.status = #{dto.flowerStatus}
+        </if>
         <if test="dto.flowerLevel !=null and dto.flowerLevel !=''">
             AND  f.`level` = #{dto.flowerLevel}
         </if>

--
Gitblit v1.9.3