From 1c34ab2e19e32cfb20c006ef28593a2d5ed4973d Mon Sep 17 00:00:00 2001 From: liyawei Date: Sun, 14 Aug 2022 23:03:46 +0800 Subject: [PATCH] =?UTF-8?q?people-=E7=94=A8=E6=88=B7=E5=90=8C=E6=AD=A5-?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=B4=A6=E5=8F=B7=E7=BB=9F=E4=B8=80=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E4=B8=BA=E5=B0=8F=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SyncDataServiceImpl.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 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 1e82ff964..5be73965b 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 @@ -261,21 +261,22 @@ public class SyncDataServiceImpl implements ISyncDataService{ for(PPEmployee ppEmployee:ppEmployeeList){ try { PPEmployeeMap.put(ppEmployee.getWorker_user_id(), ppEmployee); - //1.判断当前账号是否已添加到用户中 - if (!localUserMap.containsKey(ppEmployee.getWorker_user_id())) { - //删除数据库中与该账户相同的数据 - if(StringUtils.isNotBlank(ppEmployee.getWorker_user_id())) { + if (StringUtils.isNotBlank(ppEmployee.getWorker_user_id())) { + ppEmployee.setWorker_user_id(ppEmployee.getWorker_user_id().toLowerCase()); // 转小写 + + //1.判断当前账号是否已添加到用户中 + if (!localUserMap.containsKey(ppEmployee.getWorker_user_id())) { + //删除数据库中与该账户相同的数据 // sysUserService.removeById(ppEmployee.getId()); // 这个为什么是逻辑删除 log.info("需要新增的用户信息为:" + JSONObject.toJSONString(ppEmployee)); SysUser newUser = sysUserService.addPPUserInfo(ppEmployee); localUserMap.put(ppEmployee.getWorker_user_id(), newUser); - } - - } else { - SysUser userEO = localUserMap.get(ppEmployee.getWorker_user_id()); - log.info("需要更新的用户信息为:" + JSONObject.toJSONString(userEO) + " " + JSONObject.toJSONString(ppEmployee)); - if(userEO != null) { - sysUserService.updatePPUserInfo(userEO, ppEmployee); + }else { + SysUser userEO = localUserMap.get(ppEmployee.getWorker_user_id()); + log.info("需要更新的用户信息为:" + JSONObject.toJSONString(userEO) + " " + JSONObject.toJSONString(ppEmployee)); + if (userEO != null) { + sysUserService.updatePPUserInfo(userEO, ppEmployee); + } } }