diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/QywxScheduleJob.java b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/QywxScheduleJob.java index f5fbca5..9b8392b 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/QywxScheduleJob.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/customize/service/QywxScheduleJob.java @@ -411,13 +411,6 @@ public class QywxScheduleJob { .filter(d -> Objects.equals(d.getCorpid(), authCorpInfo.getCorpid())) .collect(Collectors.toList()); - List qyUserList = qyUserApplicationService.selectAll(); - if (null == qyUserList) { - qyUserList = new ArrayList<>(); - } - qyUserList = qyUserList.stream() - .filter(u -> u.getCorpid().equals(authCorpInfo.getCorpid())) - .collect(Collectors.toList()); for (QyDepartmentEntity department : departmentList) { // 获取部门用户列表 @@ -440,26 +433,29 @@ public class QywxScheduleJob { Map wxUserMap = wxUsers.stream() .collect(Collectors.toMap(UserListResponse.UserInfo::getUserid, Function.identity())); - List localUsers = qyUserList.stream() - .filter(u -> u.getAppid().equals(appid)) - .collect(Collectors.toList()); - Map localUserMap = localUsers.stream() - .collect(Collectors.toMap(QyUserEntity::getUserid, Function.identity())); + List qyUserList = qyUserApplicationService.selectAll(); + if (null == qyUserList) { + qyUserList = new ArrayList<>(); + } + qyUserList = qyUserList.stream() + .filter(u -> u.getCorpid().equals(authCorpInfo.getCorpid()) && u.getAppid().equals(appid)) + .collect(Collectors.toList()); // 识别需要新增的用户 + List finalQyUserList = qyUserList; List toAdd = wxUsers.stream() - .filter(wxUser -> !localUserMap.containsKey(wxUser.getUserid())) + .filter(wxUser -> finalQyUserList.stream().noneMatch(u -> u.getUserid().equals(wxUser.getUserid()))) .collect(Collectors.toList()); log.info("syncUserInfo toAdd: {}", JSONUtil.toJsonStr(toAdd)); // 识别需要删除的用户 - List toRemove = localUsers.stream() +/* List toRemove = qyUserList.stream() .filter(localUser -> !wxUserMap.containsKey(localUser.getUserid())) .collect(Collectors.toList()); - log.info("syncUserInfo toRemove: {}", JSONUtil.toJsonStr(toRemove)); + log.info("syncUserInfo toRemove: {}", JSONUtil.toJsonStr(toRemove));*/ // 识别需要更新的用户 - List toUpdate = localUsers.stream() + List toUpdate = qyUserList.stream() .filter(localUser -> wxUserMap.containsKey(localUser.getUserid())) .filter(localUser -> { UserListResponse.UserInfo wxUser = wxUserMap.get(localUser.getUserid()); @@ -557,12 +553,12 @@ public class QywxScheduleJob { } // 删除用户 - if (!toRemove.isEmpty()) { + /*if (!toRemove.isEmpty()) { BulkOperationCommand command = new BulkOperationCommand<>( toRemove.stream().map(QyUserEntity::getId).collect(Collectors.toList()) ); qyUserApplicationService.deleteUser(command); - } + }*/ } } catch (Exception e) { log.error("syncUserInfo error", e);