From 4e557c1b42a6952c0c7e1deb8faa89a5d54b11d1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 29 十二月 2018 14:49:20 +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