傅行帆 5 years ago
parent
commit
700bdbce16

+ 1
- 1
src/main/java/com/huiju/estateagents/activity/service/impl/ActivityServiceImpl.java View File

64
 		taShareRecordQueryWrapper.eq("org_id",orgId);
64
 		taShareRecordQueryWrapper.eq("org_id",orgId);
65
 		taShareRecordQueryWrapper.eq("person_id",person.getPersonId());
65
 		taShareRecordQueryWrapper.eq("person_id",person.getPersonId());
66
 		List<TaShareRecord> taShareRecords = taShareRecordMapper.selectList(taShareRecordQueryWrapper);
66
 		List<TaShareRecord> taShareRecords = taShareRecordMapper.selectList(taShareRecordQueryWrapper);
67
-		//判断是否报名了助力活动
67
+		//判断是否发起了助力活动
68
 		QueryWrapper<HelpInitiateRecord> helpInitiateRecordListQueryWrapper = new QueryWrapper<>();
68
 		QueryWrapper<HelpInitiateRecord> helpInitiateRecordListQueryWrapper = new QueryWrapper<>();
69
 		helpInitiateRecordListQueryWrapper.eq("org_id",orgId);
69
 		helpInitiateRecordListQueryWrapper.eq("org_id",orgId);
70
 		helpInitiateRecordListQueryWrapper.eq("person_id",person.getPersonId());
70
 		helpInitiateRecordListQueryWrapper.eq("person_id",person.getPersonId());

+ 2
- 0
src/main/resources/mapper/TaShareRecordMapper.xml View File

131
     <select id="getShareRecordList" resultType="com.huiju.estateagents.entity.TaShareRecord">
131
     <select id="getShareRecordList" resultType="com.huiju.estateagents.entity.TaShareRecord">
132
         SELECT
132
         SELECT
133
             t.record_id AS id,
133
             t.record_id AS id,
134
+            t.record_id,
134
             t.group_activity_id,
135
             t.group_activity_id,
135
             t.nickname,
136
             t.nickname,
136
             t.phone,
137
             t.phone,
154
 	UNION ALL
155
 	UNION ALL
155
         SELECT
156
         SELECT
156
             t.child_record_id AS id,
157
             t.child_record_id AS id,
158
+            t.record_id,
157
             t.group_activity_id,
159
             t.group_activity_id,
158
             t.nickname,
160
             t.nickname,
159
             t.phone,
161
             t.phone,