Merge branch 'v3.5.1' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5.1

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

@@ -262,7 +262,7 @@ public class TaBuildingDynamicServiceImpl extends ServiceImpl<TaBuildingDynamicM
         // 默认未签到
         taActivityDynamicEnlist.setIsCheckin(0);
         taActivityDynamicEnlist.setCreateDate(LocalDateTime.now())
-                .setBuildingId(taBuildingDynamic.getDynamicId());
+                .setBuildingId(taBuildingDynamic.getBuildingId());
         int state = taActivityDynamicEnlistMapper.insert(taActivityDynamicEnlist);
         int joinNum = taBuildingDynamic.getEnlistNum() == null ? taActivityDynamicEnlist.getAttendNum():taBuildingDynamic.getEnlistNum()+taActivityDynamicEnlist.getAttendNum();
         taBuildingDynamic.setEnlistNum(joinNum);

src/main/resources/mapper/HelpActivityMapper.xml

@@ -66,7 +66,7 @@
 			FROM
 				ta_help_activity a
 				WHERE
-                    a.org_id =#{orgId}
+                    a.org_id =#{orgId} and a.`status` = 1
                 <if test="buildingId  == null or  buildingId ==''">
                   and  a.is_main = 1
                 </if>
@@ -88,7 +88,7 @@
 				FROM
 					ta_share_activity s
 					WHERE
-                    s.org_id =#{orgId}
+                    s.org_id =#{orgId} and s.`status` = 1
                 <if test="buildingId  == null or  buildingId =='' ">
                     and  s.sort = 1
                 </if>