bug fix

src/main/resources/mapper/Activity.xml

@@ -3,11 +3,26 @@
 <mapper namespace="com.huiju.estateagents.activity.mapper.ActivityMapper">
 
     <select id="getActivityList" resultType="com.huiju.estateagents.activity.entity.Activity">
-        SELECT dynamic_id as id,img_url as main_img,title,start_date as start_date,enlist_end as end_date,weight,activity_status,'dynamic' as type FROM ta_building_dynamic WHERE org_id = #{orgId}  and `status` = #{status} and city_id = #{cityId}
+        SELECT dynamic_id as id,img_url as main_img,title,start_date as start_date,enlist_end as end_date,weight,activity_status,'dynamic' as type
+        FROM ta_building_dynamic
+        WHERE org_id = #{orgId}  and `status` = #{status}
+        <if test="cityId != null and cityId != ''">
+          and city_id = #{cityId}
+        </if>
         UNION  all
-        SELECT group_activity_id as id,main_img,activity_name as title,start_time as start_date,end_time as end_date,weight,activity_status,'group' as type from ta_share_activity WHERE org_id = #{orgId} and `status` = #{status} and city_id = #{cityId}
+        SELECT group_activity_id as id,main_img,activity_name as title,start_time as start_date,end_time as end_date,weight,activity_status,'group' as type
+        from ta_share_activity
+        WHERE org_id = #{orgId} and `status` = #{status}
+        <if test="cityId != null and cityId != ''">
+            and city_id = #{cityId}
+        </if>
         UNION  all
-        SELECT help_activity_id as id,img as main_img,title,start_date,end_date,weight,activity_status,'help' as type from ta_help_activity WHERE org_id = #{orgId} and `status` = #{status} and city_id = #{cityId}
+        SELECT help_activity_id as id,img as main_img,title,start_date,end_date,weight,activity_status,'help' as type
+        from ta_help_activity
+        WHERE org_id = #{orgId} and `status` = #{status}
+        <if test="cityId != null and cityId != ''">
+            and city_id = #{cityId}
+        </if>
         ORDER BY weight desc,activity_status,start_date
     </select>
 </mapper>