3.7

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

@@ -148,7 +148,7 @@ public class AnalysisDiyCustomerComponent {
         if(code==0){
             JSONArray MANAGER = new JSONArray();
             MANAGER.addAll(mjson.getJSONArray("userlist"));
-            success+=buildSysUser(MANAGER,loginNameSet,diyNameSet,1,failDetails,packageId,chainsMap);
+           success+=buildSysUser(MANAGER,loginNameSet,diyNameSet,1,failDetails,packageId,chainsMap);
             total+=mjson.getJSONArray("userlist").size();
         }
 
@@ -804,7 +804,9 @@ public class AnalysisDiyCustomerComponent {
             }
         }
         List<String> loginNames = sysUserService.selectUserByIsManager(isManager);
-        List<String> collect = loginNames.stream().filter(item -> !interfaceList.contains(item)).collect(Collectors.toList());
+        List<String> collect =new ArrayList<>();
+        loginNames.removeAll(interfaceList);
+        collect.addAll(loginNames);
         if (collect.size() > 0) {
             for (String login : collect
             ) {
@@ -1071,13 +1073,21 @@ public class AnalysisDiyCustomerComponent {
         List<String> loginNames7=sysUserService.selectUserByIsManager(7);
         //厨卫业务人员
         List<String> loginNames9=sysUserService.selectUserByIsManager(9);
-        List<String> collect4= loginNames4.stream().filter(item -> !interfaceList4.contains(item)).collect(Collectors.toList());
+        List<String> collect4 =new ArrayList<>();
+        loginNames4.removeAll(interfaceList4);
+        collect4.addAll(loginNames4);
         this.uninoncw(collect4, 4);
-        List<String> collect5 = loginNames5.stream().filter(item -> !interfaceList5.contains(item)).collect(Collectors.toList());
+        List<String> collect5 =new ArrayList<>();
+        loginNames5.removeAll(interfaceList5);
+        collect5.addAll(loginNames5);
         this.uninoncw(collect5, 5);
-        List<String> collect7 = loginNames7.stream().filter(item -> !interfaceList7.contains(item)).collect(Collectors.toList());
+        List<String> collect7 =new ArrayList<>();
+        loginNames7.removeAll(interfaceList7);
+        collect7.addAll(loginNames7);
         this.uninoncw(collect7, 7);
-        List<String> collect9 = loginNames9.stream().filter(item -> !interfaceList9.contains(item)).collect(Collectors.toList());
+        List<String> collect9 =new ArrayList<>();
+        loginNames9.removeAll(interfaceList9);
+        collect9.addAll(loginNames9);
         this.uninoncw(collect9, 9);
         return count;
     }
@@ -1254,8 +1264,9 @@ public class AnalysisDiyCustomerComponent {
             }
         }
         List<String> loginNames=sysUserService.selectUserByIsManager(isManager);
-        List<String > collect = loginNames.stream().filter(item -> !interfaceList8.contains(item)).collect(Collectors.toList());
-
+        List<String> collect =new ArrayList<>();
+        loginNames.removeAll(interfaceList8);
+        collect.addAll(loginNames);
         if (collect.size() > 0) {
             for (String login:collect
             ) {
@@ -1429,7 +1440,9 @@ public class AnalysisDiyCustomerComponent {
             }
         }
         List<String> loginNames=sysUserService.selectUserByIsManager(isManager);
-        List<String > collect=loginNames.stream().filter(item -> !interfaceList10.contains(item)).collect(Collectors.toList());
+        List<String> collect =new ArrayList<>();
+        loginNames.removeAll(interfaceList10);
+        collect.addAll(loginNames);
         if (collect.size() > 0) {
             for (String login:collect
             ) {
@@ -1617,7 +1630,9 @@ public class AnalysisDiyCustomerComponent {
             }
         }
         List<String> loginNames = sysUserService.selectUserByIsManager(isManager);
-        List<String> collect = loginNames.stream().filter(item -> !interfaceList.contains(item)).collect(Collectors.toList());
+        List<String> collect =new ArrayList<>();
+        loginNames.removeAll(interfaceList);
+        collect.addAll(loginNames);
         if (collect.size() > 0) {
             for (String login : collect
             ) {