From 88e43ba8b0c7f95f4cdc2476e310a89b4282dbab Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 9 Jun 2022 19:04:59 +0800 Subject: [PATCH] =?UTF-8?q?people=E5=90=8C=E6=AD=A5=E7=94=A8=E6=88=B7-?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=B7=A5=E7=A8=8B=E5=B8=88?= =?UTF-8?q?=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/system/service/impl/SysUserServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 954895db0..0804bcf55 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 @@ -494,7 +494,7 @@ public class SysUserServiceImpl extends ServiceImpl impl sysUser.setRealname(ppEmployee.getFormatted_name()); sysUser.setStatus("Active".equals(ppEmployee.getEmployee_status())? CommonConstant.USER_UNFREEZE : CommonConstant.USER_FREEZE); sysUser.setDelFlag("1".equals(ppEmployee.getDelete_flag())? CommonConstant.DEL_FLAG_0 : CommonConstant.DEL_FLAG_1); - sysUser.setThirdId(ppEmployee.getWorker_user_id()); + sysUser.setThirdId(ppEmployee.getUser_name()); sysUser.setActivitiSync(CommonConstant.ACT_SYNC_1); sysUser.setWorkNo(ppEmployee.getEmployee_id()); sysUser.setWorkerType("Employee".equals(ppEmployee.getWorker_type())? CommonConstant.WORKER_TYPE_1 : CommonConstant.WORKER_TYPE_2); @@ -520,6 +520,11 @@ public class SysUserServiceImpl extends ServiceImpl impl // 添加用户部门关系 SysUserDepart sysUserDepart = new SysUserDepart(ppEmployee.getId(), ppEmployee.getSupervisory_organization_ref_id()); sysUserDepartMapper.insert(sysUserDepart); + + // 添加用户角色关系 + SysUserRole userRole = new SysUserRole(sysUser.getId(), "1534020318437208065"); // 新增用户默认角色均为工程师 + sysUserRoleMapper.insert(userRole); + // 添加用户信息 save(sysUser); return sysUser; @@ -533,7 +538,7 @@ public class SysUserServiceImpl extends ServiceImpl impl sysUser.setRealname(ppEmployee.getFormatted_name()); sysUser.setStatus("Active".equals(ppEmployee.getEmployee_status())? CommonConstant.USER_UNFREEZE : CommonConstant.USER_FREEZE); sysUser.setDelFlag("1".equals(ppEmployee.getDelete_flag())? CommonConstant.DEL_FLAG_0 : CommonConstant.DEL_FLAG_1); - sysUser.setThirdId(ppEmployee.getWorker_user_id()); + sysUser.setThirdId(ppEmployee.getUser_name()); sysUser.setWorkNo(ppEmployee.getEmployee_id()); sysUser.setWorkerType("Employee".equals(ppEmployee.getWorker_type())? CommonConstant.WORKER_TYPE_1 : CommonConstant.WORKER_TYPE_2); sysUser.setCreateTime(ppEmployee.getCreation_time());