Merge remote-tracking branch 'origin/user-customer-24821' into uat

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

@@ -882,6 +882,10 @@ public class AnalysisDiyCustomerComponent {
                     String CustomerManager = u.getSysUserExt().getIsCustomerManager();
                     String[] manager = CustomerManager.split(",");
                     if (manager.length > 1) {
+                        List<AssRelcustomerinfo> assRelcustomerinfoList = assRelcustomerinfoService.selectRelcustomerinfoByKunnr(null, String.valueOf(u.getUserId()));
+                        if(assRelcustomerinfoList !=null && assRelcustomerinfoList.size()>0){
+                            assRelcustomerinfoService.deleteAssRelcustomerinfoByUserId(u.getUserId().toString(), u.getSysUserExt().getOrgCode());
+                        }
                         List<String> resultList = new ArrayList<>(manager.length);
                         Collections.addAll(resultList,manager);
                         Object i=isManager;
@@ -1355,6 +1359,10 @@ public class AnalysisDiyCustomerComponent {
                     String CustomerManager= u.getSysUserExt().getIsCustomerManager();
                     String[] manager=CustomerManager.split(",");
                     if(manager.length >1){
+                        List<AssRelcustomerinfo> assRelcustomerinfoList = assRelcustomerinfoService.selectRelcustomerinfoByKunnr(null, String.valueOf(u.getUserId()));
+                        if(assRelcustomerinfoList !=null && assRelcustomerinfoList.size()>0){
+                            assRelcustomerinfoService.deleteAssRelcustomerinfoByUserId(u.getUserId().toString(), u.getSysUserExt().getOrgCode());
+                        }
                         List<String> resultList = new ArrayList<>(manager.length);
                         Collections.addAll(resultList,manager);
                         Object i=isManager;
@@ -1542,6 +1550,10 @@ public class AnalysisDiyCustomerComponent {
                     String CustomerManager= u.getSysUserExt().getIsCustomerManager();
                     String[] manager=CustomerManager.split(",");
                     if(manager.length >1){
+                        List<AssRelcustomerinfo> assRelcustomerinfoList = assRelcustomerinfoService.selectRelcustomerinfoByKunnr(null, String.valueOf(u.getUserId()));
+                        if(assRelcustomerinfoList !=null && assRelcustomerinfoList.size()>0){
+                            assRelcustomerinfoService.deleteAssRelcustomerinfoByUserId(u.getUserId().toString(), u.getSysUserExt().getOrgCode());
+                        }
                         List<String> resultList = new ArrayList<>(manager.length);
                         Collections.addAll(resultList,manager);
                         Object i=isManager;
@@ -1745,6 +1757,10 @@ public class AnalysisDiyCustomerComponent {
                     String CustomerManager = u.getSysUserExt().getIsCustomerManager();
                     String[] manager = CustomerManager.split(",");
                     if (manager.length > 1) {
+                        List<AssRelcustomerinfo> assRelcustomerinfoList = assRelcustomerinfoService.selectRelcustomerinfoByKunnr(null, String.valueOf(u.getUserId()));
+                        if(assRelcustomerinfoList !=null && assRelcustomerinfoList.size()>0){
+                            assRelcustomerinfoService.deleteAssRelcustomerinfoByUserId(u.getUserId().toString(), u.getSysUserExt().getOrgCode());
+                        }
                         List<String> resultList = new ArrayList<>(manager.length);
                         Collections.addAll(resultList,manager);
                         Object i=isManager;