From 9a3e7296fc80cfa5ffc10f90978af4f18ed2d0e9 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 6 Apr 2021 09:08:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BBbug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/ScreenProjectCategoryGridDailyDao.xml              | 4 +++-
 .../screen/ScreenProjectCategoryOrgDailyDao.xml               | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.xml
index 4bf7ba8edf..ba818db4ef 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryGridDailyDao.xml
@@ -31,9 +31,11 @@
             </if>
             <if test="null != level and '' != level">
                 AND sca.`LEVEL` = #{level}
+                AND(
                 <foreach collection="gridIds" item="gridId" separator=" OR ">
-                    AND sg.GRID_ID = #{gridId}
+                    sg.GRID_ID = #{gridId}
                 </foreach>
+                )
             </if>
           AND sg.CUSTOMER_ID = #{customerId}
           AND sg.DATE_ID = #{dateId}
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml
index 98b4eb7248..07b8d2f5b8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.xml
@@ -48,7 +48,8 @@
         WHERE 1=1
           AND od.DEL_FLAG = '0'
           AND (
-          <foreach collection="customerIds" item="id" separator=" OR ">od.CUSTOMER_ID = #{id}
+          <foreach collection="customerIds" item="id" separator=" OR ">
+              od.CUSTOMER_ID = #{id}
           </foreach>
                   )
           <if test="existsStatus == true">