From 9e7a80ef1dc64e24b96b81a0718d9891fbc133a0 Mon Sep 17 00:00:00 2001 From: liyawei Date: Wed, 15 Jun 2022 10:02:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=94=A8=E6=88=B7bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/impl/SyncDataServiceImpl.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 aa96f5627..69f0ecfab 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 @@ -211,7 +211,7 @@ public class SyncDataServiceImpl implements ISyncDataService{ if (!localUserMap.containsKey(ppEmployee.getId())) { //删除数据库中与该账户相同的数据 if(StringUtils.isNotBlank(ppEmployee.getId())) { - sysUserService.removeById(ppEmployee.getId()); +// sysUserService.removeById(ppEmployee.getId()); // 这个为什么是逻辑删除 log.info("需要新增的用户信息为:" + JSONObject.toJSONString(ppEmployee)); SysUser newUser = sysUserService.addPPUserInfo(ppEmployee); localUserMap.put(ppEmployee.getId(), newUser); @@ -260,16 +260,16 @@ public class SyncDataServiceImpl implements ISyncDataService{ } List userEmailInfoList = JSONObject.parseArray(user.get("people_contact_email").toString(), PPEmployee.class); if (CollectionUtil.isNotEmpty(userEmailInfoList)) { - PPEmployee userEmailInfo = userEmailInfoList.stream().filter(e->"WORK".equals(e.getEmail_type())).collect(Collectors.toList()).get(0); - if (ObjectUtil.isNotEmpty(userEmailInfo)) { - userMainInfo.setEmail_address(userEmailInfo.getEmail_address()); + List userEmailInfo = userEmailInfoList.stream().filter(e->"WORK".equals(e.getEmail_type())).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(userEmailInfo)) { + userMainInfo.setEmail_address(userEmailInfo.get(0).getEmail_address()); } } List userPhoneInfoList = JSONObject.parseArray(user.get("people_contact_phone").toString(), PPEmployee.class); if (CollectionUtil.isNotEmpty(userPhoneInfoList)) { - PPEmployee userPhoneInfo = userPhoneInfoList.stream().filter(e->"WORK".equals(e.getPhone_type()) && "Mobile".equals(e.getPhone_device_type())).collect(Collectors.toList()).get(0); - if (ObjectUtil.isNotEmpty(userPhoneInfo)) { - userMainInfo.setFormatted_phone_number(userPhoneInfo.getFormatted_phone_number()); + List userPhoneInfo = userPhoneInfoList.stream().filter(e->"WORK".equals(e.getPhone_type()) && "Mobile".equals(e.getPhone_device_type())).collect(Collectors.toList()); + if (CollectionUtil.isNotEmpty(userPhoneInfo)) { + userMainInfo.setFormatted_phone_number(userPhoneInfo.get(0).getFormatted_phone_number()); } }