From e4a74cbbb4f34b9e88dfa6edb8296a7e5b9e127c Mon Sep 17 00:00:00 2001
From: hexiaohui <hexiaohui@LAPTOP-03V48RSB>
Date: 星期日, 27 一月 2019 21:28:16 +0800
Subject: [PATCH] 增加分享活动订单及相关服务

---
 fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java
index f5c7b93..71849a7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/ActivityAdminController.java
@@ -63,6 +63,16 @@
 			recommendActivity.setInviteInfo(info);
 		}
 
+		if (recommendActivity !=null) {
+			ActivityUser activityUser = recommendActivity.getActivityUser();
+			if (activityUser != null) {
+				ActivityUser resultUser = activityService.selectActivityUserByPrimaryKey(activityUser.getId());
+				if (resultUser != null) {
+					recommendActivity.setActivityUser(resultUser);
+				}
+			}
+		}
+		
 		if (StringUtil.isNullOrEmpty(callback)) {
 			out.print(JsonUtil.loadTrueResult(recommendActivity));
 		} else {

--
Gitblit v1.8.0