fix ldap findByUserIds error (apolloconfig#1910)

Fix the issue 'Container type has already been specified as AND, cannot change it to OR'
zyy · Jan 24, 2019 · 92e811f · 92e811f
1 parent 5e39268
commit 92e811f
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/ldap/LdapUserService.java b/apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/ldap/LdapUserService.java
@@ -84,10 +84,9 @@ public List<UserInfo> findByUserIds(List<String> userIds) {
     if (CollectionUtils.isEmpty(userIds)) {
       return null;
     } else {
-      ContainerCriteria criteria = ldapQueryCriteria()
-          .and(query().where(loginIdAttrName).is(userIds.get(0)));
+      ContainerCriteria criteria = query().where(loginIdAttrName).is(userIds.get(0));
       userIds.stream().skip(1).forEach(userId -> criteria.or(loginIdAttrName).is(userId));
-      return ldapTemplate.search(criteria, ldapUserInfoMapper);
+      return ldapTemplate.search(ldapQueryCriteria().and(criteria), ldapUserInfoMapper);
     }
   }