Merge branch '松江大数据中心专用' of http://47.103.92.60:3003/skyversation-public/place_name_search into 松江大数据中心专用

src/main/java/com/skyversation/poiaddr/addquery/AddressQueryEngine.java

@@ -98,8 +98,10 @@ public class AddressQueryEngine {
                 return getCjWgWgwByLoc(addressResult);
             }
         }*/
-        addressResult.setCode(AddressResultEnum.RESULT_NULL);
-        addressResult.setMessage("失败");
+//        addressResult.setCode(AddressResultEnum.RESULT_NULL);
+        if(addressResult != null){
+            addressResult.setMessage("失败");
+        }
         return addressResult;
     }
 

src/main/java/com/skyversation/poiaddr/service/impl/YyskAddressStandardizationServiceImpl.java

@@ -386,7 +386,7 @@ public class YyskAddressStandardizationServiceImpl {
                 if (addrList.size() > 0) {
                     //  TODO 开始查询
                     AddressResult addressResult = AddressQueryEngine.getInstance().commonSearchByName(addrList);
-                    if (addressResult.getData() == null || addressResult.getData().size() < 1) {
+                    if (addressResult == null || addressResult.getData() == null || addressResult.getData().size() < 1) {
                         item.setMatchLevel("异常");
                         item.setReturnAddress("未匹配到符合规则的结果");
                     } else {