Merge remote-tracking branch 'origin/master'

cweb/src/main/java/com/hfkj/controller/UserTeamController.java

@@ -59,32 +59,45 @@ public class UserTeamController {
             // 团队好友
             map.put("teamFriend", subList.stream().filter(o -> o.getRelType().equals(2)).count());
 
+            // 活跃情况
             Map<String,Object> active = new HashMap<>();
             // 今日
             Map<String,Object> today = new HashMap<>();
-            today.put("newFriend", "");
+            today.put("newFriend", "0");
-            today.put("activeFriend", "");
+            today.put("activeFriend", "0");
             active.put("today", today);
 
             // 昨日
             Map<String,Object> yesterday = new HashMap<>();
-            yesterday.put("newFriend", "");
+            yesterday.put("newFriend", "0");
-            yesterday.put("activeFriend", "");
+            yesterday.put("activeFriend", "0");
             active.put("yesterday", yesterday);
 
             // 本月
             Map<String,Object> thisMonth = new HashMap<>();
-            thisMonth.put("newFriend", "");
+            thisMonth.put("newFriend", "0");
-            thisMonth.put("activeFriend", "");
+            thisMonth.put("activeFriend", "0");
             active.put("thisMonth", thisMonth);
 
             // 上月
             Map<String,Object> lastMonth = new HashMap<>();
-            lastMonth.put("newFriend", "");
+            lastMonth.put("newFriend", "0");
-            lastMonth.put("activeFriend", "");
+            lastMonth.put("activeFriend", "0");
             active.put("lastMonth", lastMonth);
 
             map.put("active", active);
+
+            // 邀请人
+            if (userSession.getUser().getInviteUserId() != null) {
+                // 邀请人数据
+                BsUser inviteUser = userService.getUser(userSession.getUser().getInviteUserId());
+                if (inviteUser != null) {
+                    inviteUser.setPhone(null);
+                }
+                map.put("inviteUser", inviteUser);
+            } else {
+                map.put("inviteUser", null);
+            }
             return ResponseMsgUtil.success(map);
 
         } catch (Exception e) {