From 871b1188f0bfcea98a1b5b8c057bec5b81565e47 Mon Sep 17 00:00:00 2001 From: liyawei Date: Fri, 12 Aug 2022 14:25:05 +0800 Subject: [PATCH] =?UTF-8?q?people-=E5=90=8C=E6=AD=A5=E7=94=A8=E6=88=B7-?= =?UTF-8?q?=E6=AC=A7=E6=B4=B2=E7=8E=AF=E5=A2=83-bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jero/modules/system/entity/PPEmployee.java | 2 +- .../jero/modules/system/service/impl/SyncDataServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java index 68fbad730..6797f735b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java @@ -51,7 +51,7 @@ public class PPEmployee { private String data_provider; // 第三方数据提供商 private String extension_attribute1; // O365标签 private String working_hour; // 工作制 - private String domain; // 账号所属域 + private String domain; // 账号所属域 美国-amer private String ad_failed; // 创建ad失败原账号 private String have_employees; // 是否有下属员工 private String id; // id ----id diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java index a50b39aab..1e82ff964 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java @@ -227,7 +227,7 @@ public class SyncDataServiceImpl implements ISyncDataService{ JSONObject resultJsonEU = (JSONObject) myJsonEU.get("data"); //将第一页的账户信息转换为本地dto集合 List userListEU = JSONObject.parseArray(resultJsonEU.get("list").toString(), JSONObject.class); - List currentPPEmployeeListEU = getPPEmployeeList(userListEU, "EN"); + List currentPPEmployeeListEU = getPPEmployeeList(userListEU, "EU"); ppEmployeeList.addAll(currentPPEmployeeListEU); //获取总记录数 @@ -246,7 +246,7 @@ public class SyncDataServiceImpl implements ISyncDataService{ log.debug("【欧洲】打印输出本次同步信息返回结果:"+myJsonEU.get("data").toString()); resultJsonEU = (JSONObject) myJsonEU.get("data"); userListEU = JSONObject.parseArray(resultJsonEU.get("list").toString(), JSONObject.class); - currentPPEmployeeListEU = getPPEmployeeList(userListEU, "EN"); + currentPPEmployeeListEU = getPPEmployeeList(userListEU, "EU"); ppEmployeeList.addAll(currentPPEmployeeListEU); } }