From 735883f04e0be2a5c0235b5fb5fd388192ab8330 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 18 十二月 2018 14:40:25 +0800
Subject: [PATCH] 邀请有奖代码恢复 用户登录BUG修复
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
index 1bfdb31..80d62ee 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserAccountServiceImpl.java
@@ -103,15 +103,16 @@
@Override
public LoginResult login(HttpServletRequest request, Boolean first, String appId, String code, String phone,
UserInfo tbUserInfo, boolean wxinstall, int loginType) throws UserAccountException {
-
+
JSONObject logInfo = new JSONObject();
logInfo.put("appId", appId);
logInfo.put("code", code);
logInfo.put("phone", phone);
- logInfo.put("tbUserInfo", tbUserInfo);
+ if (tbUserInfo != null)
+ logInfo.put("tbUserInfo", tbUserInfo.getId());
logInfo.put("loginType", loginType);
LogHelper.lgoinInfo(logInfo.toString());
-
+
HttpSession session = request.getSession();
if (first != null && first == true)
session.removeAttribute("LAST_LOGIN_USER");
@@ -319,7 +320,8 @@
logInfo.put("appId", appId);
logInfo.put("code", code);
logInfo.put("phone", phone);
- logInfo.put("tbUserInfo", tbUserInfo);
+ if (tbUserInfo != null)
+ logInfo.put("tbUserInfo", tbUserInfo.getId());
logInfo.put("loginType", loginType);
LogHelper.lgoinInfo(logInfo.toString());
--
Gitblit v1.8.0