From 1b1f8fb628c08fc757139a34e2293db8d2529092 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 24 一月 2019 10:13:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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