Merge branch '20251124经销商拉取人事数据调整' into uat

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

@@ -1129,11 +1129,15 @@ public class AnalysisDiyCustomerComponent {
                         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);
-                            }
+
                             if (user.getSysUserExt().getOrgCode() != null && (!customerCode.equals(userOld.getSysUserExt().getOrgCode()) || !customerCode.equals(userOld.getSysUserExt().getCustomerCode()) )) {
+
+                                assRelcustomerinfoList = assRelcustomerinfoService.selectRelcustomerinfoByKunnr(customerCode, user.getUserId().toString());
+                                if (assRelcustomerinfoList != null && assRelcustomerinfoList.size() > 0) {
+                                    log.info("删除用户关联经销商----"+user.getUserId().toString()+"经销商身份代码--"+isManager);
+                                    assRelcustomerinfoService.deleteAssRelcustomerinfoByUserId(user.getUserId().toString(), customerCode);
+                                }
+
                                     AssRelcustomerinfo info = new AssRelcustomerinfo();
                                     info.setUserId(userOld.getUserId().toString());
                                     if(!customerCode.equals(userOld.getSysUserExt().getOrgCode())){
@@ -1153,6 +1157,8 @@ public class AnalysisDiyCustomerComponent {
                                          info.setName1(Name);
                                     }
                                     info.setGlfs("用户关联");
+                                    log.info("新增用户关联经销商----"+user.getUserId().toString());
+                                    log.info("新增用户关联经销商----"+info+"经销商身份代码--"+isManager);
                                     assRelcustomerinfoService.insertAssRelcustomerinfo(info);
 
                                 }