From e6670f2a6513c0f1d6e4f2d867d1010970014849 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 11 九月 2019 15:36:39 +0800
Subject: [PATCH] Merge branch 'master-2.0-pre-rename' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoModifyRecordServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoModifyRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoModifyRecordServiceImpl.java
index e51187d..dcf17ed 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoModifyRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoModifyRecordServiceImpl.java
@@ -21,6 +21,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoModifyRecordService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
@Service
@@ -112,10 +113,14 @@
addModifyRecord(uid, ModifyTypeEnum.bindWeiXin, user.getWxUnionId());
}
- if (user.getNickName() != null && !user.getNickName().startsWith("杩斿埄鍒�")) {
+ if (user.getNickName() != null && !user.getNickName().startsWith("鏉挎牀蹇渷")) {
addModifyRecord(uid, ModifyTypeEnum.nickName, user.getNickName() + "");
}
+ if (!Constant.systemCommonConfig.getDefaultPortrait().equalsIgnoreCase(user.getPortrait())) {
+ addModifyRecord(uid, ModifyTypeEnum.portrait, user.getPortrait());
+ }
+
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
if (userInfoExtra != null) {
if (userInfoExtra.getSex() != null)
--
Gitblit v1.8.0