Merge remote-tracking branch 'origin/import' into import

src/main/java/org/rcisoft/integration/jieLink/service/impl/JieLinkServiceImpl.java

@@ -147,9 +147,10 @@ public class JieLinkServiceImpl  implements IJieLinkService {
             try{
                 if(HttpStatus.OK.value() ==responseEntity.getStatusCode().value()) {
                     log.debug("pushAddUserData接口返回信息："+responseEntity.getBody().toJSONString());
-                    JieLinkResultDto<JieLinkPersonDto> resultData = JSONObject.toJavaObject(responseEntity.getBody(), JieLinkResultDto.class);
-                    if(StringUtils.equals(resultData.getCode(),"0")){
-                        JieLinkPersonDto persion = resultData.getData();
+                    JSONObject body = responseEntity.getBody();
+                    if(body.containsKey("code") && StringUtils.equals("0",body.getString("code"))){
+                        JSONObject data = body.getJSONObject("data");
+                        JieLinkPersonDto persion = JSONObject.parseObject(data.toJSONString(),JieLinkPersonDto.class);
                         if(persion!=null){
                             //此处需要将捷顺中的ID存入到用户信息中
                             String personId = persion.getPersonId();
@@ -165,9 +166,8 @@ public class JieLinkServiceImpl  implements IJieLinkService {
                             //返回结果为空
                             return false;
                         }
-
                     }else{
-                        log.error("pushAddUserData接口返回错误信息："+resultData.getMsg());
+                        log.error("pushAddUserData接口返回错误信息："+body.getString("msg"));
                         //请求返回结果错误啦
                         return false;
                     }