From c3ec06ec2c2c0f798e98038ca51caf86bb42c596 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 30 May 2022 16:16:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=88=A4=E6=96=ADdel=3D0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/org/IcHouseDao.xml  | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/IcHouseDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/IcHouseDao.xml
index e2dacf96e8..e6f28fc433 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/IcHouseDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/IcHouseDao.xml
@@ -25,12 +25,14 @@
         LEFT JOIN ic_neighbor_hood n ON h.NEIGHBOR_HOOD_ID = n.id
         WHERE
         h.CREATED_TIME &lt; DATE_ADD( DATE_FORMAT(#{dateId},'%Y-%m-%d'), INTERVAL 1 DAY )
+        AND n.DEL_FLAG = '0'
+        AND h.DEL_FLAG = '0'
         ) t ON t.GRID_ID = g.ID
-        <where>
-            <if test='customerId != "" and customerId != null '>
-                AND g.CUSTOMER_ID = #{customerId}
-            </if>
-        </where>
+        WHERE
+        g.DEL_FLAG = '0'
+        <if test='customerId != "" and customerId != null '>
+            AND g.CUSTOMER_ID = #{customerId}
+        </if>
         GROUP BY
         g.CUSTOMER_ID,
         g.id
@@ -47,11 +49,12 @@
         customer_grid g
         LEFT JOIN ic_neighbor_hood n ON n.GRID_ID = g.id
         AND n.CREATED_TIME &lt; DATE_ADD( DATE_FORMAT(#{dateId},'%Y-%m-%d'), INTERVAL 1 DAY )
-        <where>
-            <if test='customerId != "" and customerId != null '>
-                AND g.CUSTOMER_ID = #{customerId}
-            </if>
-        </where>
+        AND n.DEL_FLAG = '0'
+        WHERE
+        g.DEL_FLAG = '0'
+        <if test='customerId != "" and customerId != null '>
+            AND g.CUSTOMER_ID = #{customerId}
+        </if>
         GROUP BY
         g.CUSTOMER_ID,
         g.id;