1.修改查询条件无效问题，修改第三方系统和第三方系统名称，ID字段模糊查询

2.测试连通性适配空返回问题

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) {

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}

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>