Merge remote-tracking branch 'origin/master'

boman-web-core/src/main/java/com/boman/web/core/controller/CountryProxyQsBdcController.java

@@ -194,7 +194,7 @@ public class CountryProxyQsBdcController {
     //民政部_婚姻登记信息核验(双方)
     @ApiOperation(value = "民政部_婚姻登记信息核验(双方)")
     @GetMapping("/hydjxxhysf")
-    public String hydjxxhysf(
+    public AjaxResult hydjxxhysf(
             @ApiParam(value = "男方姓名") @RequestParam String name_man,
             @ApiParam(value = "男方身份证件号码") @RequestParam String cert_num_man,
             @ApiParam(value = "女方姓名") @RequestParam String name_woman,
@@ -225,7 +225,15 @@ public class CountryProxyQsBdcController {
         params.putOnce("name_woman", name_woman);
         params.putOnce("cert_num_woman", cert_num_woman);
         postParams.put("biz_content", params.toString());
-        return postRequest(ProxyConstants.SID.HYDJXXHYSF, gjzwfwpt_sign, gjzwfwpt_rtime, postParams);
+        String json = postRequest(ProxyConstants.SID.HYDJXXHYSF, gjzwfwpt_sign, gjzwfwpt_rtime, postParams);
+        List<Map<String, Object>> listMap = new ArrayList<>();
+        Map<String, Object> jsonObject = JSONUtil.toBean(json,HashMap.class);
+        Map<String, Object> map = (Map<String, Object>) jsonObject.get("biz_data");
+        if(map.get("result")!=null){
+            listMap.add((Map<String, Object>)map.get("result"));
+        }
+        return AjaxResult.success("成功",listMap);
+
     }
 
     //民政部_婚姻登记信息核验(双方)(新)
@@ -366,8 +374,8 @@ public class CountryProxyQsBdcController {
 
         Map<String, Object> jsonObject = JSONUtil.toBean(json,HashMap.class);
         Map<String, Object> map = (Map<String, Object>) jsonObject.get("biz_data");
-
-        return AjaxResult.success("成功",map.get("rows"));
+        return AjaxResult.success("成功",json);
+        //return AjaxResult.success("成功",map.get("rows"));
     }
 
     //民政部_社会团体法人登记证书查询(新)
@@ -402,8 +410,8 @@ public class CountryProxyQsBdcController {
 
         Map<String, Object> jsonObject = JSONUtil.toBean(json,HashMap.class);
         Map<String, Object> map = (Map<String, Object>) jsonObject.get("biz_data");
-
-        return AjaxResult.success("成功",map.get("rows"));
+        return AjaxResult.success("成功",json);
+        //return AjaxResult.success("成功",map.get("rows"));
     }
 
     //民政部_社会团体名称变更登记记录查询
@@ -434,8 +442,8 @@ public class CountryProxyQsBdcController {
 
         Map<String, Object> jsonObject = JSONUtil.toBean(json,HashMap.class);
         Map<String, Object> map = (Map<String, Object>) jsonObject.get("biz_data");
-
-        return AjaxResult.success("成功",map.get("rows"));
+        return AjaxResult.success("成功",json);
+        //return AjaxResult.success("成功",map.get("rows"));
     }
 
     // 民政部_涉外婚姻登记信息查询