From 8e94c7d52e07ec052f5d0fdac0b2d4690d403dde Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 20 Jul 2024 07:48:59 +0800
Subject: [PATCH] md

---
 .../java/com/xdadan/erp/oms/web/Oms2cWaybillController.java   | 4 ++--
 .../java/com/xdadan/erp/oms/mapper/EmisWaybillMapper.java     | 2 +-
 .../java/com/xdadan/erp/oms/service/IEmisWaybillService.java  | 2 +-
 .../xdadan/erp/oms/service/impl/EmisWaybillServiceImpl.java   | 2 +-
 emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
index d8c368b..89f941e 100644
--- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
+++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cWaybillController.java
@@ -219,8 +219,8 @@ public class Oms2cWaybillController extends BaseController
 //            "phone":"联系电话",
 //            "ownerSiteCode":"所属网点编号",
 //            "ownerSiteName":"所属网点名称",
-        Map emp = emisWaybillService.queryNewSalesmen(searchValue);
-        if(emp==null){
+        List<Map> empList = emisWaybillService.queryNewSalesmen(searchValue);
+        if(CollectionUtil.isEmpty(empList)){
             return AjaxResult.error("业务员不存在");
         }
         return AjaxResult.success("获取成功",emp);
diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisWaybillMapper.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisWaybillMapper.java
index bb1fe11..e3c20e4 100644
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisWaybillMapper.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/mapper/EmisWaybillMapper.java
@@ -48,7 +48,7 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
      * @param searchValue
      * @return
      */
-    public Map queryNewSalesmen(@Param("searchValue")String searchValue);
+    public List<Map> queryNewSalesmen(@Param("searchValue")String searchValue);
 
 
     /**
diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisWaybillService.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisWaybillService.java
index e2353b4..74686a6 100644
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisWaybillService.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/IEmisWaybillService.java
@@ -36,7 +36,7 @@ public interface IEmisWaybillService
 
     public int bindSalesmen(String empCode) throws EmisBizError;
 
-    public Map queryNewSalesmen(String searchValue);
+    public List<Map> queryNewSalesmen(String searchValue);
 
 
 
diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWaybillServiceImpl.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWaybillServiceImpl.java
index b3306ea..4c62433 100644
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWaybillServiceImpl.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/service/impl/EmisWaybillServiceImpl.java
@@ -78,7 +78,7 @@ public class EmisWaybillServiceImpl  implements IEmisWaybillService
     }
 
     @Override
-    public Map queryNewSalesmen(String searchValue)
+    public List<Map> queryNewSalesmen(String searchValue)
     {
         return emisWaybillMapper.queryNewSalesmen(searchValue);
     }
diff --git a/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 1a9614a..8c3db48 100644
--- a/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -572,7 +572,7 @@
         sys_user a,emis_site b
         WHERE a.owner_site_code=b.site_code
         <if test="searchValue != null and searchValue != ''">
-            and a.emp_code=#{searchValue}
+            and (a.emp_code=#{searchValue} or a.phonenumber=#{searchValue})
         </if>
     </select>