From 81491580b89b32fff2e11aa8c85b54c7c92d0ed6 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 19 May 2020 09:35:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=AF=9D=E9=A2=98=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0groupId=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/topic/TopicDao.xml               | 3 +++
 1 file changed, 3 insertions(+)

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