Merge branch 'ww'

2 years ago · f54e7d2fea
parent f086482fdd da9c3c4360
commit f54e7d2fea
1 changed files with 6 additions and 1 deletions
--- a/src/main/java/com/glxp/api/http/ErpBasicClient.java
+++ b/src/main/java/com/glxp/api/http/ErpBasicClient.java
@ -158,7 +158,12 @@ public class ErpBasicClient {
            BaseResponse<PageSimpleResponse<ThrSystemBusApiEntity>> udiDlDeviceResponse =
                    JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<ThrSystemBusApiEntity>>>() {
                    });
-            return udiDlDeviceResponse;
+            if(udiDlDeviceResponse!=null){
+                return udiDlDeviceResponse;
+            }else{
+                return ResultVOUtils.error(500, "查询第三方数据失败！");
+            }
+
        } catch (Exception e) {
            log.error("获取单据类型异常", e);
            return ResultVOUtils.error(500, "连接第三方系统接口服务出错！");