From cd89f7cfa8d3fd42853dc6373e4cc5ab1bb9dc97 Mon Sep 17 00:00:00 2001
From: king <hfjinsong@163.com>
Date: Thu, 26 Mar 2026 08:34:43 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E9=94=80=E5=94=AE=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E8=A1=A8=20sql=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/framework/NewGrBiSaAggMonthCountMapper.xml     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml
index 789072c..ee0334b 100644
--- a/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml
+++ b/lidee-core/src/main/resources/mapper/framework/NewGrBiSaAggMonthCountMapper.xml
@@ -391,7 +391,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         new_gr_bi_sa_agg_month_count
         <where>
             <if test="saAggParam.useYear != null  and saAggParam.useYear != ''"> and use_year = #{saAggParam.useYear}</if>
-            <if test="saAggParam.useMonth != null "> and use_month = #{saAggParam.useMonth}</if>
+            <if test="saAggParam.useMonth != null  and saAggParam.useMonth != ''"> and use_month = #{saAggParam.useMonth}</if>
             <if test="saAggParam.zoneName != null  and saAggParam.zoneName != ''"> and zone_name in
                 <foreach collection="saAggParam.zoneName" item="name" open="(" separator="," close=")">
                     #{name}
@@ -573,8 +573,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM new_gr_bi_sa_agg_month_count
         <where>
             <if test="saAggParam.useYear != null  and saAggParam.useYear != ''"> and use_year = #{saAggParam.useYear }- 1</if>
-            <if test="saAggParam.useMonth != null "> and use_month = #{saAggParam.useMonth}</if>
-            <if test="saAggParam.zoneName != null  and zoneName != ''"> and zone_name in
+            <if test="saAggParam.useMonth != null and saAggParam.useMonth != ''"> and use_month = #{saAggParam.useMonth}</if>
+            <if test="saAggParam.zoneName != null  and saAggParam.zoneName != ''"> and zone_name in
                 <foreach collection="saAggParam.zoneName" item="name" open="(" separator="," close=")">
                     #{name}
                 </foreach>
@@ -679,7 +679,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ) total_month_data ON total_month_data.use_year = current_month.use_year
         <where>
             <if test="saAggParam.useYear != null  and saAggParam.useYear != ''"> and current_month.use_year = #{saAggParam.useYear}</if>
-            <if test="saAggParam.useMonth != null "> and current_month.use_month = #{saAggParam.useMonth}</if>
+            <if test="saAggParam.useMonth != null  and saAggParam.useMonth != ''"> and current_month.use_month = #{saAggParam.useMonth}</if>
             <if test="saAggParam.zoneName != null  and saAggParam.zoneName != ''"> and current_month.zone_name in
                 <foreach collection="saAggParam.zoneName" item="name" open="(" separator="," close=")">
                     #{name}