From aa784ab65cc24caf45a4c38af7e5fdeb526eb393 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 五月 2019 14:49:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
index 99b30c6..f83b2c9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
@@ -934,7 +934,7 @@
 		String fileLink= COSManager.getInstance().uploadFile(inputStream, filePath).getUrl();
 		
 		userInfo.setPortrait(fileLink);
-		userInfoMapper.updateByPrimaryKey(userInfo);
+		userInfoMapper.updateByPrimaryKeySelective(userInfo);
 	}
 	
 	
@@ -945,9 +945,7 @@
 			throw new UserInfoException(1, "鐢ㄦ埛涓嶅瓨鍦�");
 		}
 		
-		UserInfo updateInfo = new UserInfo();
-		updateInfo.setId(userInfo.getId());
-		updateInfo.setNickName(nickName);
-		userInfoMapper.updateByPrimaryKeySelective(updateInfo);
+		userInfo.setNickName(nickName);
+		userInfoMapper.updateByPrimaryKeySelective(userInfo);
 	}
 }

--
Gitblit v1.8.0