From cf409837c69b80d2f6fe292f8d4511052214e75b Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 14 Jul 2020 09:09:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=A4=E8=AF=9D=E9=A2=98=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E5=86=8D=E4=BD=BF=E7=94=A8=E7=BD=91=E6=A0=BC?=
 =?UTF-8?q?ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/smile/topic/GroupTopicDao.xml      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/epdc-cloud-property/src/main/resources/mapper/smile/topic/GroupTopicDao.xml b/epdc-cloud-property/src/main/resources/mapper/smile/topic/GroupTopicDao.xml
index e36faaf..0c758d8 100644
--- a/epdc-cloud-property/src/main/resources/mapper/smile/topic/GroupTopicDao.xml
+++ b/epdc-cloud-property/src/main/resources/mapper/smile/topic/GroupTopicDao.xml
@@ -166,7 +166,6 @@
         <if test="userId == null or userId.trim() == ''">
             AND t1.STATE <![CDATA[ <> ]]> 20
             AND t1.GROUP_ID = #{groupId}
-            AND t1.GRID_ID = #{gridId}
             <if test="timestamp != null and timestamp.trim() != ''">
                 <![CDATA[ AND DATE_FORMAT(t1.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
             </if>