合并

src/main/resources/mapper/HelpActivityMapper.xml

@@ -63,7 +63,7 @@
 				ta_help_activity a
 				WHERE
                     a.org_id =#{orgId}
-                <if test="buildingId  == null ">
+                <if test="buildingId  == null or  buildingId ==''">
                   and  a.is_main = 1
                 </if>
                 <if test="cityID != null and cityID != ''">
@@ -84,7 +84,7 @@
 					ta_share_activity s
 					WHERE
                     s.org_id =#{orgId}
-                <if test="buildingId  == null ">
+                <if test="buildingId  == null or  buildingId =='' ">
                     and  s.sort = 1
                 </if>
                 <if test="cityID != null and cityID != ''">