区分

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

@@ -673,7 +673,7 @@ public class AnalysisDiyCustomerComponent {
                         userExt.setCustomerCode(userExt.getOrgCode());
                     } else {
                         userExt.setCustomerCode(jo.getString("depCode"));
-                   }
+                    }
 //                    /**======== 构建diy用户wx信息表 start===============*/
 //                    WxQyUser wxQyUser = new WxQyUser();
 //                    wxQyUser.setUserid(jo.getString("userid"));
@@ -826,7 +826,7 @@ public class AnalysisDiyCustomerComponent {
                     }
                 }
             }
-         }
+        }
         return count;
     }
 
@@ -1114,12 +1114,17 @@ public class AnalysisDiyCustomerComponent {
     public Integer buildSysUserStaff(JSONArray STAFF, Set<String> loginNameSet,Set<String> diyNameSet, List<SyncFailDetail> failDetails,String packageId, Map<String,Customers> cusMap,Integer isManager){
         //JSONArray jsonArray = json.getJSONArray("data");
         int count = 0;
-        List<String > interfaceList=new ArrayList<>();
+        List<String > interfaceList8=new ArrayList<>();
+        List<String > interfaceList10=new ArrayList<>();
         for(int x =0;x<STAFF.size();x++){
             JSONObject jsonObject = STAFF.getJSONObject(x);
             String loginName = jsonObject.getString("userid");
             if(loginName !=null && !"".equals(loginName)){
-                interfaceList.add(loginName);
+                if(isManager==8){
+                    interfaceList8.add(loginName);
+                }else{
+                    interfaceList10.add(loginName);
+                }
             }
         }
         for(int i =0;i<STAFF.size();i++){
@@ -1254,9 +1259,14 @@ 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<>();
+        if(isManager ==8){
+            collect = loginNames.stream().filter(item -> !interfaceList8.contains(item)).collect(Collectors.toList());
+        }else{
+            collect = loginNames.stream().filter(item -> !interfaceList10.contains(item)).collect(Collectors.toList());
+        }
         if (collect.size() > 0) {
-        for (String login:collect
+            for (String login:collect
             ) {
                 SysUser u = sysUserService.selectUserByLoginName(login);
                 if(("0").equals(u.getIsSync())){
@@ -1444,7 +1454,7 @@ public class AnalysisDiyCustomerComponent {
         List<String> loginNames = sysUserService.selectUserByIsManager(isManager);
         List<String> collect = loginNames.stream().filter(item -> !interfaceList.contains(item)).collect(Collectors.toList());
         if (collect.size() > 0) {
-        for (String login : collect
+            for (String login : collect
             ) {
                 SysUser u = sysUserService.selectUserByLoginName(login);
                 if (("0").equals(u.getIsSync())) {