提交分支

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

@@ -188,21 +188,21 @@ public class SocialServiceImpl implements SocialServiceI {
         if (Constant.INVALID.equals(taUser.getStatus())
             && Constant.OWNER.equals(sysRole.getRoleName())){
 
-            return insertActivitySignUp(tpActivity, communityId);
+            return insertActivitySignUp(tpActivity, communityId, userId);
         }
 
         //身份为家属租客，状态为已停用
         if (Constant.INVALID.equals(taUser.getStatus())
             && (Constant.FAMILYMEMBER.equals(sysRole.getRoleName())) || Constant.TENANT.equals(sysRole.getRoleName())){
 
-            return insertActivitySignUp(tpActivity, communityId);
+            return insertActivitySignUp(tpActivity, communityId, userId);
         }
 
         if (Constant.EFFECTIVE.equals(taUser.getStatus())
                 && (Constant.FAMILYMEMBER.equals(sysRole.getRoleName()))
                 || Constant.TENANT.equals(sysRole.getRoleName())
                 || Constant.OWNER.equals(sysRole.getRoleName())){
-            return insertActivitySignUp(tpActivity, communityId);
+            return insertActivitySignUp(tpActivity, communityId, userId);
         }
         responseBean.addError("9999", "服务器异常");
         return responseBean;
@@ -307,11 +307,11 @@ public class SocialServiceImpl implements SocialServiceI {
         tpTicketRecordMapper.insertSelective(record);
     }
 
-    public ResponseBean insertActivitySignUp(TpActivity tpActivity, Integer communityId){
+    public ResponseBean insertActivitySignUp(TpActivity tpActivity, Integer communityId, Integer userId){
         ResponseBean responseBean = new ResponseBean();
         //判断是否已经报名
         //todo
-        Integer signNum = tpActivitySignupMapper.findTpActivetitySignByUserId(tpActivity.getId(), communityId, 1);
+        Integer signNum = tpActivitySignupMapper.findTpActivetitySignByUserId(tpActivity.getId(), communityId, userId);
         if (signNum != 0){
             responseBean.addError("9996", "您已报名，请勿重复报名");
             return responseBean;