From b3139e2307fbf9f74b0cca873a6e6a095f8c0a5e Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 13 Jul 2022 15:30:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/ScreenProjectDataDao.xml           | 27 ++++---------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
index a52fb831b7..6cf57e3109 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml
@@ -240,28 +240,11 @@
             FROM
                 screen_project_process spp
             WHERE
-                ( spp.CUSTOMER_ID = '2fe0065f70ca0e23ce4c26fca5f1d933' OR spp.CUSTOMER_ID = '44876154d10d7cb7affd92000f84f833' OR spp.CUSTOMER_ID = '46c55cb862d6d5e6d05d2ab61a1cc07e' )
-                AND OPERATION = 'closed_case'
-                <if test='null != customerId and "" != customerId'>
-                    AND spp.CUSTOMER_ID = #{customerId}
-                </if>
-                <if test='null != projectIds and projectIds.size()>0'>
-                    <foreach collection="projectIds" item="projectId" open="AND (" separator=" OR " close=" )">
-                       spp.PROJECT_ID = #{projectId}
-                    </foreach>
-                </if>
-            UNION ALL
-            SELECT
-                spp.CUSTOMER_ID,
-                PROJECT_ID,
-                HANDLER_ID,
-                HANDLER_TYPE,
-                ORG_ID_PATH
-            FROM
-                screen_project_process spp
-            WHERE
-                ( spp.CUSTOMER_ID != '2fe0065f70ca0e23ce4c26fca5f1d933' AND spp.CUSTOMER_ID != '44876154d10d7cb7affd92000f84f833' AND spp.CUSTOMER_ID != '46c55cb862d6d5e6d05d2ab61a1cc07e' )
-                AND OPERATION = 'close'
+                (( spp.CUSTOMER_ID = '2fe0065f70ca0e23ce4c26fca5f1d933' OR spp.CUSTOMER_ID = '44876154d10d7cb7affd92000f84f833' OR spp.CUSTOMER_ID = '46c55cb862d6d5e6d05d2ab61a1cc07e' )
+                AND OPERATION = 'closed_case')
+                OR
+                (( spp.CUSTOMER_ID != '2fe0065f70ca0e23ce4c26fca5f1d933' AND spp.CUSTOMER_ID != '44876154d10d7cb7affd92000f84f833' AND spp.CUSTOMER_ID != '46c55cb862d6d5e6d05d2ab61a1cc07e' )
+                AND OPERATION = 'close')
                 <if test='null != customerId and "" != customerId'>
                     AND spp.CUSTOMER_ID = #{customerId}
                 </if>