查询经销商更换到经销商主数据上

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

@@ -829,7 +829,9 @@ public class AnalysisDiyCustomerComponent {
                         }
                         List<AssRelcustomerinfo> assRelcustomerinfoList = new ArrayList<>();
                         /*过滤导购*/
-                        if (isManager != 0 && !("019").equals(user.getSysUserExt().getOrgCode().substring(0, 3)) && !("019").equals(user.getSysUserExt().getCustomerCode().substring(0, 3))) {
+                        if (isManager != 0 && !("019").equals(userOld.getSysUserExt().getOrgCode().substring(0, 3)) && !("019").equals(userOld.getSysUserExt().getCustomerCode().substring(0, 3))
+                                && !("019").equals(user.getSysUserExt().getOrgCode().substring(0, 3)) && !("019").equals(user.getSysUserExt().getCustomerCode().substring(0, 3))
+                        ) {
                             assRelcustomerinfoList = assRelcustomerinfoService.selectRelcustomerinfoByKunnr(customerCode, user.getUserId().toString());
                             if (assRelcustomerinfoList != null && assRelcustomerinfoList.size() > 0) {
                                 assRelcustomerinfoService.deleteAssRelcustomerinfoByUserId(user.getUserId().toString(), customerCode);

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

@@ -131,10 +131,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <select id="selectCustomerMapByCode" resultMap="CustomersResult">
-       SELECT MainCustomerCode as code,MainCustomerName as chains_name,MainCustomerCode as chains_code FROM data_master_customer where MainCustomerCode is not null;
+       SELECT MainCustomerCode as code,MainCustomerName as chains_name,MainCustomerCode as chains_code FROM data_master_customer where MainCustomerCode is not null
     </select>
     <select id="selectCustomerMapByChainsCode" resultMap="CustomersResult">
-        SELECT MainCustomerCode as chains_code,MainCustomerName as chains_name FROM data_master_customer where MainCustomerCode is not null;
+        SELECT MainCustomerCode as chains_code,MainCustomerName as chains_name FROM data_master_customer where MainCustomerCode is not null
     </select>
 
     <select id="selectCustomerNameByCustomerCode" resultType="java.lang.String">