WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

people-同步用户-欧洲环境-bug修改

Browse Source
This commit is contained in:
liyawei
2022-08-12 14:25:05 +08:00
parent eb022b8982
commit 871b1188f0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/PPEmployee.java
+1 -1
View File
@@ -51,7 +51,7 @@ public class PPEmployee {
private String data_provider; // 第三方数据提供商 private String data_provider; // 第三方数据提供商
private String extension_attribute1; // O365标签 private String extension_attribute1; // O365标签
private String working_hour; // 工作制 private String working_hour; // 工作制
private String domain; // 账号所属域 private String domain; // 账号所属域 美国-amer
private String ad_failed; // 创建ad失败原账号 private String ad_failed; // 创建ad失败原账号
private String have_employees; // 是否有下属员工 private String have_employees; // 是否有下属员工
private String id; // id ----id private String id; // id ----id
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SyncDataServiceImpl.java
+2 -2
View File
@@ -227,7 +227,7 @@ public class SyncDataServiceImpl implements ISyncDataService{
JSONObject resultJsonEU = (JSONObject) myJsonEU.get("data"); JSONObject resultJsonEU = (JSONObject) myJsonEU.get("data");
//将第一页的账户信息转换为本地dto集合 //将第一页的账户信息转换为本地dto集合
List<JSONObject> userListEU = JSONObject.parseArray(resultJsonEU.get("list").toString(), JSONObject.class); List<JSONObject> userListEU = JSONObject.parseArray(resultJsonEU.get("list").toString(), JSONObject.class);
List<PPEmployee> currentPPEmployeeListEU = getPPEmployeeList(userListEU, "EN"); List<PPEmployee> currentPPEmployeeListEU = getPPEmployeeList(userListEU, "EU");
ppEmployeeList.addAll(currentPPEmployeeListEU); ppEmployeeList.addAll(currentPPEmployeeListEU);
//获取总记录数 //获取总记录数
@@ -246,7 +246,7 @@ public class SyncDataServiceImpl implements ISyncDataService{
log.debug("【欧洲】打印输出本次同步信息返回结果:"+myJsonEU.get("data").toString()); log.debug("【欧洲】打印输出本次同步信息返回结果:"+myJsonEU.get("data").toString());
resultJsonEU = (JSONObject) myJsonEU.get("data"); resultJsonEU = (JSONObject) myJsonEU.get("data");
userListEU = JSONObject.parseArray(resultJsonEU.get("list").toString(), JSONObject.class); userListEU = JSONObject.parseArray(resultJsonEU.get("list").toString(), JSONObject.class);
currentPPEmployeeListEU = getPPEmployeeList(userListEU, "EN"); currentPPEmployeeListEU = getPPEmployeeList(userListEU, "EU");
ppEmployeeList.addAll(currentPPEmployeeListEU); ppEmployeeList.addAll(currentPPEmployeeListEU);
} }
} }