Merge remote-tracking branch 'origin/user-24930' into uat

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

@@ -859,6 +859,8 @@ public class AnalysisDiyCustomerComponent {
                                 /*更新职位*/
                                 user.getSysUserExt().setIsCustomerManager(user.getSysUserExt().getIsCustomerManager() + "," + isManager);
                             }
+                            //处理导购多身份时，不更新经销商编码
+                            if(!("019").equals(customerCode.substring(0, 3)) && isManager != 0){
                             if (!user.getSysUserExt().getCustomerCode().equals(customerCode) || !user.getSysUserExt().getOrgCode().equals(customerCode)) {
                                 /*更新经销商code*/
                                 if (cusMap.containsKey(customerCode)) {
@@ -874,12 +876,15 @@ public class AnalysisDiyCustomerComponent {
                             }
                             log.info("updateSysUserExt" + customerCode);
                             sysUserExtMapper.updateSysUserExt(user.getSysUserExt());
+                            }
                         }
-                        if(("019").equals(user.getSysUserExt().getCustomerCode().substring(0, 3))){
-                            user.getSysUserExt().setCustomerCode(user.getSysUserExt().getOrgCode());
+                        if(("019").equals(user.getSysUserExt().getCustomerCode().substring(0, 3)) && user.getSysUserExt().getIsCustomerManager() == "0"){
+                            user.getSysUserExt().setCustomerCode(customerCode);
+                            user.getSysUserExt().setOrgCode(customerCode);
+                            user.getSysUserExt().setOrgName(customerName);
                             sysUserExtMapper.updateSysUserExt(user.getSysUserExt());
                         }
-                        if(user.getSysUserExt().getIsCustomerManager() !=null){
+                       /* if(user.getSysUserExt().getIsCustomerManager() !=null){
                             if(user.getSysUserExt().getIsCustomerManager().contains("0")){
                                 if(("019").equals(user.getSysUserExt().getOrgCode().substring(0, 3))){
                                     if (cusMap.containsKey(customerCode)) {
@@ -892,7 +897,7 @@ public class AnalysisDiyCustomerComponent {
                                     }
                                 }
                             }
-                        }
+                        }*/
                         /*解决名称不一样的情况*/
                         if (!user.getUserName().equals(name)) {
                             user.setUserName(name);