# Conflicts:

#	suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/mapper/CustomersMapper.java
#	suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/AnalysisDiyCustomerComponent.java
#	suishenbang-sync/suishenbang-sync-common/src/main/resources/mapper/sync/CustomersMapper.xml
#	suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysUserOrderAuthorServiceImpl.java

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/mapper/CustomersMapper.java

@@ -70,7 +70,7 @@ public interface CustomersMapper
     public Map<String,Customers> selectCustomerMapByChainsCode();
 
     @MapKey("chainsCode")
-    public Map<String,Customers> selectCustomerMapByChainsCodeByCode(String CustomerCode);
+    public Map<String,Customers> selectCustomerMapByChainsCodeByCode();
 
     /**
      * @description:根据经销商code查询名称

suishenbang-sync/suishenbang-sync-common/src/main/java/com/dgtly/sync/service/AnalysisDiyCustomerComponent.java

@@ -678,7 +678,7 @@ public class AnalysisDiyCustomerComponent {
     try {
         log.info("接收到参数depCode:{},userNO:{}",depCode,userNo);
             String url = customerAccessTokenUtil.getUrl(UrlType.MANAGERLIST, null);
-            Map<String,Customers> chainsMap = customersMapper.selectCustomerMapByChainsCodeByCode(depCode);
+            Map<String,Customers> chainsMap = customersMapper.selectCustomerMapByChainsCodeByCode();
             List<SyncFailDetail> failDetails = new ArrayList<>();
             //获取经销商负责人
             //拼接请求参数

suishenbang-sync/suishenbang-sync-common/src/main/resources/mapper/sync/CustomersMapper.xml

@@ -138,7 +138,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectCustomerMapByChainsCodeByCode" resultMap="CustomersResult">
-        SELECT CustomerCode as chains_code,CustomerName as chains_name FROM data_master_customer where CustomerCode = #{CustomerCode}
+        SELECT DISTINCT CustomerCode as chains_code,CustomerName as chains_name FROM data_master_customer
     </select>
 
     <select id="selectCustomerNameByCustomerCode" resultType="java.lang.String">

suishenbang-system/src/main/java/com/dgtly/system/service/impl/SysUserOrderAuthorServiceImpl.java

@@ -885,7 +885,7 @@ public class SysUserOrderAuthorServiceImpl implements ISysUserOrderAuthorService
         log.info("获取非bmd的机构数量:{}", sysDictData.size());
         List<String> subOfficeName = sysDictData.stream().map(SysDictData::getDictLabel).collect(Collectors.toList());
         for (DataMasterCustomerVO customerVO : customerVOSOld){
-            if (subOfficeName.contains(customerVO.getSalesGroupName()) || "SSB".equals(customerVO.getCustomerTypeCode5()) || ("D01".equals(customerVO.getCustomerTypeCode1()) && "否".equals(customerVO.getIsBMDCustomer())) || "D01".equals(customerVO.getCustomerTypeCode1())){
+            if (subOfficeName.contains(customerVO.getSalesGroupName()) || "SSB".equals(customerVO.getCustomerTypeCode5()) || ("D01".equals(customerVO.getCustomerTypeCode1()) && "否".equals(customerVO.getIsBMDCustomer())) || "D06".equals(customerVO.getCustomerTypeCode1())){
                 customerVOS.add(customerVO);
             }
         }