From 1a80e4a3aa37f1debfd72e773006407699d4677b Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 31 Jul 2024 07:29:50 +0800
Subject: [PATCH] md

---
 .../java/com/xdadan/erp/oms/domain/EmisCustomerAddress.java | 4 ++++
 .../main/java/com/xdadan/erp/oms/domain/vo/Salesmen.java    | 3 +++
 .../java/com/xdadan/erp/oms/mapper/EmisWaybillMapper.java   | 2 +-
 .../xdadan/erp/oms/service/impl/EmisWaybillServiceImpl.java | 2 +-
 .../src/main/resources/mapper/EmisWaybillMapper.xml         | 6 +++---
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisCustomerAddress.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisCustomerAddress.java
index 0f3542a..a8a7760 100644
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisCustomerAddress.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/EmisCustomerAddress.java
@@ -72,6 +72,10 @@ public class EmisCustomerAddress extends BaseEntity
     private String useSiteCode;
 
 
+    // 默认 1-是 0-否
+    private String defaultFlag;
+
+
     private String countryName;
     private String provinceName;
     private String cityName;
diff --git a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/Salesmen.java b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/Salesmen.java
index 9bb613d..dba7571 100644
--- a/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/Salesmen.java
+++ b/emis-oms-biz/src/main/java/com/xdadan/erp/oms/domain/vo/Salesmen.java
@@ -24,5 +24,8 @@ public class Salesmen extends BaseEntity {
     private String phone;
     private String ownerSiteCode;
     private String ownerSiteName;
+
+    private String blDefaultFlag;
+
     private String defaultFlag;
 }
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 40524e4..fad7c12 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
@@ -42,7 +42,7 @@ public interface EmisWaybillMapper extends BaseMapper<EmisWaybill>
      */
     public List<Map> selectUserBindSalesmenList(@Param("customerCode") String customerCode,
                                                 @Param("searchValue")String searchValue,
-                                                @Param("defaultFlag")String defaultFlag);
+                                                @Param("blDefaultFlag")String blDefaultFlag);
 
 
     /**
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 6a814dd..770f425 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
@@ -77,7 +77,7 @@ public class EmisWaybillServiceImpl  implements IEmisWaybillService
         return emisWaybillMapper.selectUserBindSalesmenList(
                 SecurityUtils.getLoginUser().getUser().getCustomerCode(),
                 salesmen.getSearchValue(),
-                salesmen.getDefaultFlag()
+                salesmen.getBlDefaultFlag()
         );
     }
 
diff --git a/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 17dd8dd..ef9f740 100644
--- a/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -547,7 +547,7 @@
             b.phonenumber AS phone,
             b.owner_site_code AS ownerSiteCode,
             '' AS ownerSiteName,
-            a.default_flag as defaultFlag
+            a.default_flag as blDefaultFlag
         FROM
             sys_oms_user_bind_emp a,
             sys_user b
@@ -557,8 +557,8 @@
         <if test="searchValue != null and searchValue != ''">
             and b.emp_name like concat('%', #{searchValue}, '%')
         </if>
-        <if test="defaultFlag != null and defaultFlag != ''">
-            and b.default_flag=#{defaultFlag}
+        <if test="blDefaultFlag != null and blDefaultFlag != ''">
+            and b.default_flag=#{blDefaultFlag}
         </if>
     </select>