Merge branch 'ythcj_hunanhb' of http://39.99.224.27:9022/yangliang/hnxtbaboot into ythcj_hunanhb

hnxtba-interface/src/main/java/com/founder/controller/ZjController.java

@@ -1111,8 +1111,8 @@ public class ZjController {
                 synchro.setP_strSEX_ID(zj.getXbdm());
                 synchro.setP_strAGE(nl);
                 synchro.setP_strhigh(zj.getSgsx());
-                synchro.setP_strAddress(zj.getXzzDzmc());
-                synchro.setP_strRY_UNIT(zj.getHjdzXzqhmc());
+                synchro.setP_strAddress(StringUtils.isBlank(zj.getXzzDzmc())?"无":zj.getXzzDzmc());
+                synchro.setP_strRY_UNIT(StringUtils.isBlank(zj.getHjdzXzqhmc() )?"无":zj.getHjdzXzqhmc() );
                 synchro.setP_strSF_CODE(sfzh);
                 synchro.setP_strBIRTHDAY(zj.getCsrqQsrqStr());
                 if (StringUtils.isNotBlank(zj.getZhsjStr())) {