Merge remote-tracking branch 'origin/dev_issue_category' into dev

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}

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">