同步问题修改

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

@@ -1023,8 +1023,6 @@ public class SubSyncBusinessImpl implements ISubSyncBusiness {
         List<JSONObject> content = page.getContent();
         List<AuthUserAddOriginal> originals = new ArrayList<>();
         // 过滤接口中数据中因多个职务导致重复的人员数据
-        // 如果是先删除再新增人员,会同时同步到两条数据,idcard为同一个,但是delete字段不同
-        // 过滤接口中数据中因多个职务导致重复的人员数据
         Set<String> idcardSet = new HashSet<>();
         for (JSONObject json : content) {
             String idcard = json.getString("idcard");

dcuc-auth-service/src/main/java/com/dragoninfo/dcuc/auth/sub/repo/AuthUserOrgRelRepository.java

@@ -34,7 +34,7 @@ public interface AuthUserOrgRelRepository extends BaseRepository<AuthUserOrgRel,
      */
     @Modifying
     @NativeQuery("update t_auth_user_org_rel r inner join t_auth_org_info o on r.org_code = o.code " +
-            "set r.org_id = o.id where and r.deleted = '0' and o.deleted = '0' r.org_code is not null and r.org_id is null")
+            "set r.org_id = o.id where r.deleted = '0' and o.deleted = '0' and r.org_code is not null and r.org_id is null")
     void updateOrgInfoInUser();
 
     /**

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

@@ -384,7 +384,6 @@ public class AuthOrgTreeServiceImpl implements IAuthOrgTreeService {
                         .flatMap(List::stream)
                         .distinct()
                         .map(treeNodeMap::get)
-                        .filter(Objects::nonNull)
                         .collect(Collectors.toList());
                 selfNodes.addAll(collect);
                 return deepCopy(selfNodes);