|
@@ -89,6 +89,9 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
|
|
|
//新增用户角色
|
|
|
if(sysUser.getRoles() != null){
|
|
|
sysUserDao.batchAddEmployeeRole(user.getId(),sysUser.getRoles());
|
|
|
+ }else {
|
|
|
+ Integer roleIds = sysUserDao.queryRoleIds(queryUserInfo.getId());
|
|
|
+ sysUserDao.batchAddEmployeeRole(sysUser.getId(),roleIds);
|
|
|
}
|
|
|
if(!user.getUserType().contains("SYSTEM")){
|
|
|
user.setUserType(user.getUserType() + ",SYSTEM");
|
|
@@ -107,6 +110,9 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
|
|
|
sysUserDao.update(sysUser);
|
|
|
if(sysUser.getRoles() != null){
|
|
|
sysUserDao.batchAddEmployeeRole(sysUser.getId(),sysUser.getRoles());
|
|
|
+ }else {
|
|
|
+ Integer roleIds = sysUserDao.queryRoleIds(queryUserInfo.getId());
|
|
|
+ sysUserDao.batchAddEmployeeRole(sysUser.getId(),roleIds);
|
|
|
}
|
|
|
Employee employee = employeeDao.get(sysUser.getId());
|
|
|
employee.setDelFlag(false);
|
|
@@ -134,6 +140,9 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
|
|
|
sysUserDao.delEmployeeRole(sysUser.getId());
|
|
|
if(sysUser.getRoles() != null){
|
|
|
sysUserDao.batchAddEmployeeRole(sysUser.getId(),sysUser.getRoles());
|
|
|
+ }else {
|
|
|
+ Integer roleIds = sysUserDao.queryRoleIds(queryUserInfo.getId());
|
|
|
+ sysUserDao.batchAddEmployeeRole(sysUser.getId(),roleIds);
|
|
|
}
|
|
|
Employee employee = new Employee();
|
|
|
employee.setOrganId(organ.getId());
|
|
@@ -173,6 +182,10 @@ public class OrganizationServiceImpl extends BaseServiceImpl<Integer, Organizati
|
|
|
sysUserDao.batchDelEmployeeRole(userIds);
|
|
|
if(sysUser.getRoles() != null){
|
|
|
sysUserDao.batchAddEmployeeRoles(userIds,sysUser.getRoles());
|
|
|
+ }else {
|
|
|
+ SysUser queryUserInfo = sysUserFeignService.queryUserInfo();
|
|
|
+ Integer roleIds = sysUserDao.queryRoleIds(queryUserInfo.getId());
|
|
|
+ sysUserDao.batchAddEmployeeRole(sysUser.getId(),roleIds);
|
|
|
}
|
|
|
|
|
|
sysUserDao.update(sysUser);
|