|
@@ -268,7 +268,7 @@ public class UserController extends BaseApiController {
|
|
// 如果用户头像字段为空,则默认获取用户支付宝头像
|
|
// 如果用户头像字段为空,则默认获取用户支付宝头像
|
|
String avatarUrl = userInfoResponse.getAvatar();
|
|
String avatarUrl = userInfoResponse.getAvatar();
|
|
|
|
|
|
- if (StringUtils.isBlank(loginUser.getUser().getAvatar()) && !StringUtils.isBlank(avatarUrl)) {
|
|
|
|
|
|
+ if (!StringUtils.isBlank(avatarUrl)) {
|
|
try {
|
|
try {
|
|
//下载并且重新上传头像
|
|
//下载并且重新上传头像
|
|
JSONObject result = saveHeadImage(avatarUrl, String.valueOf(user.getUserId()));
|
|
JSONObject result = saveHeadImage(avatarUrl, String.valueOf(user.getUserId()));
|
|
@@ -336,7 +336,7 @@ public class UserController extends BaseApiController {
|
|
if (accountList.size() == 1) {
|
|
if (accountList.size() == 1) {
|
|
user.setGzhOpenId(accountList.get(0).getOpenid());
|
|
user.setGzhOpenId(accountList.get(0).getOpenid());
|
|
}
|
|
}
|
|
- if (StringUtils.isBlank(loginUser.getUser().getAvatar()) && !StringUtils.isBlank(avatarUrl)) {
|
|
|
|
|
|
+ if (!StringUtils.isBlank(avatarUrl)) {
|
|
try {
|
|
try {
|
|
//下载并且重新上传头像
|
|
//下载并且重新上传头像
|
|
JSONObject result = saveHeadImage(avatarUrl, String.valueOf(user.getUserId()));
|
|
JSONObject result = saveHeadImage(avatarUrl, String.valueOf(user.getUserId()));
|