|
@@ -3004,7 +3004,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
String searchBase = "DC="+dcFirst+",DC="+dcSecond;
|
|
String searchBase = "DC="+dcFirst+",DC="+dcSecond;
|
|
|
// 创建搜索控制器
|
|
// 创建搜索控制器
|
|
|
SearchControls searchCtls = new SearchControls();
|
|
SearchControls searchCtls = new SearchControls();
|
|
|
- String[] returnedAttrs={"givenName","name","distinguishedName","objectGUID", "objectCategory", "logonCount","sAMAccountName","userPrincipalName"};
|
|
|
|
|
|
|
+ String[] returnedAttrs={"givenName","name","distinguishedName","userAccountControl","objectGUID", "objectCategory", "logonCount","sAMAccountName","userPrincipalName"};
|
|
|
searchCtls.setReturningAttributes(returnedAttrs); //设置指定返回的字段，不设置则返回全部
|
|
searchCtls.setReturningAttributes(returnedAttrs); //设置指定返回的字段，不设置则返回全部
|
|
|
// 设置搜索范围 深度
|
|
// 设置搜索范围 深度
|
|
|
searchCtls.setSearchScope(SearchControls.SUBTREE_SCOPE);
|
|
searchCtls.setSearchScope(SearchControls.SUBTREE_SCOPE);
|
|
@@ -3242,7 +3242,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
List<JSONObject> userArrays = getUser();
|
|
List<JSONObject> userArrays = getUser();
|
|
|
|
|
+ Integer[] ints = {514, 546, 66050, 66080, 66082};
|
|
|
|
|
+ List<Integer> disable = Arrays.asList(ints);
|
|
|
for (JSONObject user : userArrays) {
|
|
for (JSONObject user : userArrays) {
|
|
|
|
|
+ if(disable.contains(user.getIntValue("userAccountControl"))){
|
|
|
|
|
+ continue;
|
|
|
|
|
+ }
|
|
|
User u=new User();
|
|
User u=new User();
|
|
|
u.setId(SnowFlake.nextId()+"")
|
|
u.setId(SnowFlake.nextId()+"")
|
|
|
.setName(user.getString("name"))
|
|
.setName(user.getString("name"))
|
Min