bug fix

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

@@ -124,21 +124,6 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 		IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = personVisitRecordMapper.getDrainageVisitRecord(pg, orgId, activityName, eventType, shareName, shareTel, buildingId, personType, taPersonBuildingList);
 		List<TaPersonVisitRecord> taPersonVisitRecords = taPersonVisitRecordIPage.getRecords();
 		taPersonVisitRecords.forEach(e -> {
-			if (!StringUtils.isEmpty(e.getDrainageName())){
-				e.setActivityName(e.getDrainageName());
-			}
-			if (!StringUtils.isEmpty(e.getBuildingName())){
-				e.setActivityName(e.getBuildingName());
-			}
-			if (!StringUtils.isEmpty(e.getNewsName())){
-				e.setActivityName(e.getNewsName());
-			}
-			if (!StringUtils.isEmpty(e.getHelpActivityName())){
-				e.setActivityName(e.getHelpActivityName());
-			}
-			if (!StringUtils.isEmpty(e.getGroupActivityName())){
-				e.setActivityName(e.getGroupActivityName());
-			}
 			TaPerson personInfo = taPersonMapper.selectById(e.getPersonId());
 			if (personInfo != null){
 				e.setUserName(personInfo.getNickname());
@@ -150,6 +135,22 @@ public class TaPersonVisitRecordServiceImpl extends ServiceImpl<TaPersonVisitRec
 				e.setShareName(userShareInfo.getNickname());
 				e.setShareTel(userShareInfo.getPhone());
 			}
+
+			if (!StringUtils.isEmpty(e.getDrainageName()) && CommConstant.EVENT_H5.equals(e.getEventType())){
+				e.setActivityName(e.getDrainageName());
+			}
+			if (!StringUtils.isEmpty(e.getBuildingName()) && CommConstant.POSTER_CONTENT_TYPE_BUILDING.equals(e.getEventType())){
+				e.setActivityName(e.getBuildingName());
+			}
+			if (!StringUtils.isEmpty(e.getNewsName()) && CommConstant.POSTER_CONTENT_TYPE_NEWS.equals(e.getEventType())){
+				e.setActivityName(e.getNewsName());
+			}
+			if (!StringUtils.isEmpty(e.getHelpActivityName()) && CommConstant.POINTS_CHANGE_HELP.equals(e.getEventType())){
+				e.setActivityName(e.getHelpActivityName());
+			}
+			if (!StringUtils.isEmpty(e.getGroupActivityName()) && CommConstant.POINTS_CHANGE_GROUP.equals(e.getEventType())){
+				e.setActivityName(e.getGroupActivityName());
+			}
 		});
 		taPersonVisitRecordIPage.setRecords(taPersonVisitRecords);
 		return taPersonVisitRecordIPage;