bug

src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java

@@ -398,6 +398,8 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
                 taBuildingDynamic.setPosters(taPosterService.getPostersForTarget(taBuildingDynamic.getDynamicId(), CommConstant.POSTER_CONTENT_TYPE_ACTIVITY));
                 taBuildingDynamic.setShareContents(taShareContentService.getPostersForTarget(taBuildingDynamic.getDynamicId(), CommConstant.POSTER_CONTENT_TYPE_ACTIVITY));
 
+                //更改状态为已参与
+                taBuildingDynamic.setActivityStatus(CommConstant.ACTIVITY_STATUS_PARTNER);
 
             }
             return result;

src/main/resources/mapper/HelpActivityMapper.xml

@@ -62,9 +62,13 @@
 			FROM
 				ta_help_activity a
 				WHERE
-                  a.org_id =#{orgId}
+                    a.org_id =#{orgId}
+                <if test="buildingId  == null ">
                   and  a.is_main = 1
-                  and  a.city_id = #{cityID}
+                </if>
+                <if test="cityID != null and cityID != ''">
+                      and  a.city_id = #{cityID}
+                </if>
                 <if test="buildingId != null and buildingId != ''">
                   and a.building_id = #{buildingId}
                 </if>
@@ -79,9 +83,13 @@
 				FROM
 					ta_share_activity s
 					WHERE
-                        s.org_id =#{orgId}
+                    s.org_id =#{orgId}
+                <if test="buildingId  == null ">
                     and  s.sort = 1
+                </if>
+                <if test="cityID != null and cityID != ''">
                     and  s.city_id = #{cityID}
+                </if>
                 <if test="buildingId != null and buildingId != ''">
                     and s.building_id = #{buildingId}
                 </if>