From 8b272e8fadc44873bc169bdccb2fb57b5f78b1f5 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 8 Jul 2022 18:21:19 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=97=A0=E6=95=88=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=AC=AC=E4=B8=89=E6=96=B9=E7=B3=BB=E7=BB=9F=E5=92=8C?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9=E7=B3=BB=E7=BB=9F=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=EF=BC=8CID=E5=AD=97=E6=AE=B5=E6=A8=A1=E7=B3=8A=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=202.=E6=B5=8B=E8=AF=95=E8=BF=9E=E9=80=9A=E6=80=A7?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E7=A9=BA=E8=BF=94=E5=9B=9E=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/admin/httpclient/ErpBasicClient.java     | 8 ++++----
 .../resources/mybatis/mapper/basic/BasicThirdSysDao.xml   | 4 ++--
 .../mybatis/mapper/thrsys/ThrCorpImportLogDao.xml         | 3 ++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java
index ff3e38dc..5ab0c7ea 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java
@@ -1,10 +1,10 @@
 package com.glxp.api.admin.httpclient;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.glxp.api.admin.entity.basic.BasicThirdSysBusApiEntity;
 import com.glxp.api.admin.entity.basic.BasicThirdSysEntity;
-import com.glxp.api.admin.entity.thrsys.ThrInvWarehouseEntity;
 import com.glxp.api.admin.httpclient.req.UdiwmsBusTypeRequest;
 import com.glxp.api.admin.httpclient.req.UdiwmsUnitRequest;
 import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest;
@@ -15,9 +15,7 @@ import com.glxp.api.admin.res.PageSimpleResponse;
 import com.glxp.api.admin.res.basic.ErpProductsResponse;
 import com.glxp.api.admin.res.basic.ErpUnitsResponse;
 import com.glxp.api.admin.res.erp.UdiwmsWarehouseDetail;
-import com.glxp.api.admin.res.erp.UdiwmsWarehouseResponse;
 import com.glxp.api.admin.service.basic.BasicThirdSysService;
-import com.glxp.api.admin.util.HttpClient;
 import com.glxp.api.admin.util.HttpOkClient;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
@@ -26,7 +24,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 /**
  * 获取ERP基础数据
@@ -120,6 +117,9 @@ public class ErpBasicClient {
     public BaseResponse testConnection(BasicThirdSysEntity basicThirdSysEntity) {
         String response = httpOkClient.uCloudPost(basicThirdSysEntity.getThridUrl() + "/udiwms/erp/testConnection", "{}");
         log.info(response);
+        if (StrUtil.isBlank(response)) {
+            return ResultVOUtils.error(500, "连接失败");
+        }
         try {
             return JSONObject.parseObject(response, BaseResponse.class);
         } catch (Exception e) {
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml
index f3f9576f..bdd62b9b 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml
@@ -25,10 +25,10 @@
         SELECT * FROM basic_third_sys
         <where>
             <if test="thirdId != '' and thirdId != null">
-                AND thirdId = #{thirdId}
+                AND thirdId like concat('%',#{thirdId},'%')
             </if>
             <if test="thirdName != '' and thirdName != null">
-                AND thirdName = #{thirdName}
+                AND thirdName like concat('%',#{thirdName},'%')
             </if>
             <if test="enabled != null">
                 AND enabled = #{enabled}
diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml
index a68ec5a4..85afe623 100644
--- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml
@@ -13,12 +13,13 @@
             <if test="id != '' and id != null">
                 AND id = #{id}
             </if>
-            <if test="status != '' and status != null">
+            <if test="status != null">
                 AND status = #{status}
             </if>
             <if test="thirdSysFk != '' and thirdSysFk != null">
                 AND thirdSysFk = #{thirdSysFk}
             </if>
+
         </where>
         ORDER BY updateTime DESC
     </select>