From 7f0b3b48a09784f8b9c586eb69dc28982bb25320 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Wed, 29 Dec 2021 18:04:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=90=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/screen/ScreenIndexDataMonthlyDao.xml   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
index c04e3d18e6..230082385f 100644
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
+++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml
@@ -260,10 +260,10 @@
         WHERE
             dm.del_flag = '0'
         AND rd.del_flag = '0'
+        <if test="customerId != null and customerId != ''">
+            AND org.CUSTOMER_ID = #{customerId}
+        </if>
         <choose>
-            <when test="customerId != null and customerId != ''">
-                AND org.CUSTOMER_ID = #{customerId}
-            </when>
             <when test="areaCode != null and areaCode != ''">
                 AND org.AREA_CODE LIKE concat(#{areaCode}, '%')
             </when>