修复 bug 4609

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpActivityMapper.java

@@ -4,6 +4,8 @@ package com.community.huiju.dao;
 import com.community.huiju.model.TpActivity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultMap;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -40,4 +42,14 @@ public interface TpActivityMapper {
     List<TpActivity> selecttpActivity(@Param("id") Integer id, @Param("communityId") Integer communityId);
 
     TpActivity selectActivity(@Param("activityId") Integer activityId);
+
+    /**
+     * 根据id 查询数据活动
+     * @param activityId
+     * @return
+     */
+    @ResultMap("BaseResultMap")
+    @Select("select * from tp_activity where id=#{activityId}")
+    TpActivity selectById(@Param("activityId") Integer activityId);
+
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/SocialServiceImpl.java

@@ -268,7 +268,18 @@ public class SocialServiceImpl implements SocialServiceI {
     @Override
     public ResponseBean findTaUserInfo(UserElement userElement, Integer activityId, Integer communityId, String remark) {
         ResponseBean responseBean = new ResponseBean();
-        TpActivity tpActivity = tpActivityMapper.selectByPrimaryKey(activityId, communityId);
+        TpActivity tpActivity = tpActivityMapper.selectById(activityId);
+
+        if (null == tpActivity) {
+            responseBean.addError("活动不存在");
+            return responseBean;
+        }
+
+        if (communityId.intValue() != tpActivity.getCommunityId().intValue()) {
+            responseBean.addError("活动不属于当前小区，请到个人中心切换房产后再报名");
+            return responseBean;
+        }
+
         //判断是否已经过了报名截至时间
         Date registrEndTime = tpActivity.getRegistrationEndTime();
         if (registrEndTime.compareTo(new Date()) < 0) {