Merge branch 'dev_thirdplatform' into dev

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java

@@ -828,6 +828,7 @@ public class CodeServiceImpl implements CodeService {
 	}
 
 	private String getNickName(String appId) {
+		String nickName = "";
 		JSONObject jsonObject = new JSONObject();
 		jsonObject.put(ModuleConstant.COMPONENT_APP_ID,componentAppId);
 		jsonObject.put(ModuleConstant.AUTHORIZER_APP_ID,appId);
@@ -835,8 +836,10 @@ public class CodeServiceImpl implements CodeService {
 		String data = HttpClientManager.getInstance().sendPostByJSON(WxMaCodeConstant.API_GET_AUTHORIZER_INFO + componentAccessToken , JSON.toJSONString(jsonObject)).getData();
 		Map map = JSON.parseObject(data, Map.class);
 		Map authInfo = (Map) map.get(ModuleConstant.AUTHORIZER_INFO);
-		ConvertUtils.mapToEntity(authInfo, MiniInfoFormDTO.class).getNick_name();
-		return ConvertUtils.mapToEntity(authInfo, MiniInfoFormDTO.class).getNick_name();
+		if (StringUtils.isNotEmpty(ConvertUtils.mapToEntity(authInfo, MiniInfoFormDTO.class).getNick_name())) {
+			nickName = ConvertUtils.mapToEntity(authInfo, MiniInfoFormDTO.class).getNick_name();
+		}
+		return nickName;
 	}
 
 }