diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java index 251bde680..9bacd0c8d 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysUserMapper.java @@ -149,4 +149,6 @@ public interface SysUserMapper extends BaseMapper { * @return */ List queryByDepIds(@Param("departIds")List departIds,@Param("username") String username); + + List getPPEmployeeList(@Param("thirdType") String thirdType); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml index 1b96854a8..6c22a7661 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml @@ -195,4 +195,9 @@ and username != #{username} + + + 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 bb0397e54..9b820f396 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 @@ -202,25 +202,25 @@ public class SyncDataServiceImpl implements ISyncDataService{ List sysUserList = sysUserService.getPPEmployeeList(); // log.info("查询到的用户信息结果集为:"+JSONObject.toJSONString(userEOList)); for(SysUser user:sysUserList){ - localUserMap.put(user.getId(),user); + localUserMap.put(user.getUsername(),user); } // log.info("将用户信息集合转换为的用户MAP为:"+JSONObject.toJSONString(localUserMap)); log.info("开始更新数据库信息"); for(PPEmployee ppEmployee:ppEmployeeList){ try { - PPEmployeeMap.put(ppEmployee.getId(), ppEmployee); + PPEmployeeMap.put(ppEmployee.getUser_name(), ppEmployee); //1.判断当前账号是否已添加到用户中 - if (!localUserMap.containsKey(ppEmployee.getId())) { + if (!localUserMap.containsKey(ppEmployee.getUser_name())) { //删除数据库中与该账户相同的数据 - if(StringUtils.isNotBlank(ppEmployee.getId())) { + if(StringUtils.isNotBlank(ppEmployee.getUser_name())) { // sysUserService.removeById(ppEmployee.getId()); // 这个为什么是逻辑删除 log.info("需要新增的用户信息为:" + JSONObject.toJSONString(ppEmployee)); SysUser newUser = sysUserService.addPPUserInfo(ppEmployee); - localUserMap.put(ppEmployee.getId(), newUser); + localUserMap.put(ppEmployee.getUser_name(), newUser); } } else { - SysUser userEO = localUserMap.get(ppEmployee.getId()); + SysUser userEO = localUserMap.get(ppEmployee.getUser_name()); log.info("需要更新的用户信息为:" + JSONObject.toJSONString(userEO) + " " + JSONObject.toJSONString(ppEmployee)); if(userEO != null) { sysUserService.updatePPUserInfo(userEO, ppEmployee); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index 065a8b693..6b70e6909 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -1,6 +1,5 @@ package com.jero.modules.system.service.impl; -import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -19,7 +18,6 @@ import com.jero.modules.base.service.BaseCommonService; import com.jero.modules.system.entity.*; import com.jero.modules.system.enums.PPSyncEnum; import com.jero.modules.system.mapper.*; -import com.jero.modules.system.model.DepartIdModel; import com.jero.modules.system.model.SysUserSysDepartModel; import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.vo.SysUserDepVo; @@ -480,9 +478,7 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override public List getPPEmployeeList() { - QueryWrapper sysUserQueryWrapper = new QueryWrapper<>(); - sysUserQueryWrapper.lambda().eq(SysUser::getThirdType, PPSyncEnum.PP.getValue()); - return list(sysUserQueryWrapper); + return this.baseMapper.getPPEmployeeList(PPSyncEnum.PP.getValue()); } @Override