diff --git a/epdc-cloud-property/src/main/resources/mapper/topic/TopicDao.xml b/epdc-cloud-property/src/main/resources/mapper/topic/TopicDao.xml
index 3084f88..c9f76a8 100644
--- a/epdc-cloud-property/src/main/resources/mapper/topic/TopicDao.xml
+++ b/epdc-cloud-property/src/main/resources/mapper/topic/TopicDao.xml
@@ -159,6 +159,9 @@
         <if test="userId != null and userId.trim() != ''">
             and t1.USER_ID = #{userId}
             and t1.STATE IN (0, 20)
+            <if test="groupId != null and groupId.trim() != ''">
+                AND t1.GROUP_ID = #{groupId}
+            </if>
         </if>
         <if test="userId == null or userId.trim() == ''">
             AND t1.STATE <![CDATA[ <> ]]> 20