Merge remote-tracking branch 'remotes/origin/dev'

4 years ago · 9114871dce
1 changed files with 3 additions and 3 deletions
--- 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>