From acd2b6eaf5ebd1a9d5aa1f54a741dfa6fc52ac10 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 27 十一月 2018 17:51:01 +0800
Subject: [PATCH] Merge branch 'dev1'
---
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