人员增量同步修改

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/business/impl/SubSyncBusinessImpl.java

@@ -1023,24 +1023,19 @@ public class SubSyncBusinessImpl implements ISubSyncBusiness {
         List<AuthUserAddOriginal> originals = new ArrayList<>();
         // 过滤接口中数据中因多个职务导致重复的人员数据
         // 如果是先删除再新增人员,会同时同步到两条数据,idcard为同一个,但是delete字段不同
-        Map<String, String> idcardMap = new HashMap<>();
+        // 过滤接口中数据中因多个职务导致重复的人员数据
+        Set<String> idcardSet = new HashSet<>();
         for (JSONObject json : content) {
             String idcard = json.getString("idcard");
-            String userDeleted = json.getString("deleted");
-            if (idcardMap.containsKey(idcard) && idcardMap.get(idcard).equals(userDeleted)) {
+            if (idcardSet.contains(idcard)) {
                 continue;
             }
-            idcardMap.put(idcard, userDeleted);
+            idcardSet.add(idcard);
             AuthUserAddOriginal userOri = new AuthUserAddOriginal();
             Date updateTime = json.getDate("updateTime");
             userOri.setIdcard(idcard);
             userOri.setUserType(userType.getValue());
-            userOri.setUserDeleted(userDeleted);
             userOri.setUserUpdateTime(updateTime);
-            if(BooleanEnum.TRUE.value.equals(userDeleted)) {
-                originals.add(userOri);
-                continue ;
-            }
             userOri.setUserDeleted(BooleanEnum.FALSE.value);
             setJSONData(userType, json, userOri);
             originals.add(userOri);