合并

src/main/java/com/huiju/estateagents/activity/service/impl/ActivityServiceImpl.java

@@ -62,7 +62,7 @@ public class ActivityServiceImpl implements ActivityServiceI {
 		//判断是否报名了助力活动
 		QueryWrapper<HelpRecord> helpRecordQueryWrapper = new QueryWrapper<>();
 		helpRecordQueryWrapper.eq("org_id",orgId);
-		helpRecordQueryWrapper.eq("persion_id",person.getPersonId());
+		helpRecordQueryWrapper.eq("person_id",person.getPersonId());
 		List<HelpRecord> helpRecords = helpRecordMapper.selectList(helpRecordQueryWrapper);
 		
 		//分页获取全部数据

src/main/java/com/huiju/estateagents/entity/HelpRecord.java

@@ -52,7 +52,7 @@ public class HelpRecord implements Serializable {
     /**
      * 人员Id 人员自己
      */
-    private String persionId;
+    private String personId;
 
     /**
      * 人员姓名

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

@@ -88,7 +88,7 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		//插入数据
 		helpRecord.setOrgId(orgId);
 		helpRecord.setCreateDate(LocalDateTime.now());
-		helpRecord.setPersionId(person.getPersonId());
+		helpRecord.setPersonId(person.getPersonId());
 		helpRecordMapper.insert(helpRecord);
 		if (helpActivity.getEnlistNum().equals(helpActivity.getPersonNum())){
 			//发送微信模板消息所有人都发送--todo
@@ -98,6 +98,6 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		}
 		helpInitiateRecord.setEnlistNum(helpInitiateRecord.getEnlistNum()+1);
 		helpInitiateRecordMapper.updateById(helpInitiateRecord);
-		return ResponseBean.success(helpRecord);
+		return ResponseBean.success(helpInitiateRecord);
 	}
 }