Browse Source

Merge remote-tracking branch 'origin/dev' into test

wanghui 8 years ago
parent
commit
04b3d2ce55
1 changed files with 1 additions and 1 deletions
  1. 1 1
      src/main/java/com/goafanti/app/controller/AppApiController.java

+ 1 - 1
src/main/java/com/goafanti/app/controller/AppApiController.java

@@ -204,7 +204,7 @@ public class AppApiController extends BaseApiController {
 		User user = userServiceImpl.selectByNumber(easemobName);
 		JSONObject jsonObject = new JSONObject();
 		jsonObject.put("nickName", user.getNickname());
-		jsonObject.put("headPortraitUrl", user.getHeadPortraitUrl());
+		jsonObject.put("headPortraitUrl", null == user.getHeadPortraitUrl()?"":user.getHeadPortraitUrl());
 		res.setData(jsonObject);
 		return res;
 	}