From 114685cc870d0e00dc157656ae9039f285d3f5f1 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期五, 30 十一月 2018 15:59:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 29647e6..0894b3f 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
@@ -1618,10 +1618,10 @@
long secondTeam = threeSaleSerivce.countSecondTeam(uid, 1);
long secondTeamTotal = threeSaleSerivce.countSecondTeam(uid, null);
- JSONObject bossData = new JSONObject();
+ JSONObject bossData = null;
ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);
if (threeSale != null) {
-
+ bossData = new JSONObject();
UserInfo boss = threeSale.getBoss();
if (boss != null) {
bossData.put("nickName", boss.getNickName());
@@ -1664,10 +1664,10 @@
long secondTeam = threeSaleSerivce.countSecondTeam(uid, 1);
long secondTeamTotal = threeSaleSerivce.countSecondTeam(uid, null);
- JSONObject bossData = new JSONObject();
+ JSONObject bossData = null;
ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);
if (threeSale != null) {
-
+ bossData = new JSONObject();
UserInfo boss = threeSale.getBoss();
if (boss != null) {
bossData.put("nickName", boss.getNickName());
--
Gitblit v1.8.0