diff --git a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java index 898330ea..387450c7 100644 --- a/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java +++ b/laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java @@ -786,6 +786,7 @@ public class SysUserServiceImpl extends ServiceImpl impl lambdaUpdateWrapper.set(SysUser::getUpdateTime,user.getUpdateTime()); lambdaUpdateWrapper.set(SysUser::getUpdateBy,user.getUpdateBy()); lambdaUpdateWrapper.set(SysUser::getBirthday,user.getBirthday()); + lambdaUpdateWrapper.set(SysUser::getStatus,user.getStatus()); lambdaUpdateWrapper.set(SysUser::getEntryTime,user.getEntryTime()); lambdaUpdateWrapper.set(SysUser::getResignationTime,user.getResignationTime()); lambdaUpdateWrapper.set(SysUser::getFeishuId,user.getFeishuId()); diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java index a1d91896..a89939c3 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java @@ -253,9 +253,21 @@ public class SyncIamService { // 获取角色(多个逗号分隔),针对大部分角用户默认写死一般用户 // (TODO 需要根据实际情况再沟通一遍角色怎么自动赋予),需要和角色接口那边沟通,确认具体情况 String selectedRoles = defaultRoleIds; // 一般用户的角色ID - // 存储到用户表中 - this.sysUserService.saveUser(sysUser, selectedRoles, selectedDeparts); - iamUserCreateResponse.setUid(sysUser.getId()); + LambdaQueryWrapper querySysUser = new LambdaQueryWrapper<>(); + querySysUser.eq(SysUser::getUsername,sysUser.getUsername()); + querySysUser.eq(SysUser::getStatus,"2"); + SysUser oldSysUser = sysUserService.getOne(querySysUser,false); + if(!Objects.isNull(oldSysUser)){ + // 编辑用户 + sysUser.setId(oldSysUser.getId()); + sysUser.setStatus(1); + this.sysUserService.editUser(sysUser, null, selectedDeparts); + iamUserCreateResponse.setUid(oldSysUser.getId()); + }else{ + // 存储到用户表中 + this.sysUserService.saveUser(sysUser, selectedRoles, selectedDeparts); + iamUserCreateResponse.setUid(sysUser.getId()); + } return iamUserCreateResponse; }