From 9dcc83bc9783ff7ee6a439e60e84b4536124ab84 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期一, 26 十一月 2018 14:17:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
index 2557474..a69c22b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
@@ -1646,6 +1646,11 @@
JSONObject resultData = new JSONObject();
+ String helpLink = configService.get("team_help_url");
+ if (helpLink == null) {
+ helpLink = "";
+ }
+ resultData.put("helpLink", helpLink);
resultData.put("firstTeam", firstTeam);
resultData.put("firstTeamTotal", firstTeamTotal);
resultData.put("secondTeam", secondTeam);
@@ -1714,13 +1719,13 @@
List<ThreeSale> listThreeSale = threeSaleSerivce.listbyIdAndBossId(inviteId, uid, 1);
if (listThreeSale == null || listThreeSale.size() == 0) {
- out.print(JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ out.print(JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁鏃犳晥"));
return;
}
UserInfo worker = listThreeSale.get(0).getWorker();
if (worker == null) {
- out.print(JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ out.print(JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁鏃犳晥"));
return;
}
--
Gitblit v1.8.0