Showing
1 changed file
with
4 additions
and
12 deletions
| @@ -580,18 +580,10 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE | @@ -580,18 +580,10 @@ public class SysUserServiceImpl extends AbstractBaseService<UserMapper, SysUserE | ||
| 580 | } | 580 | } |
| 581 | baseMapper.insert(user); | 581 | baseMapper.insert(user); |
| 582 | // 如果为普通租户绑定用户和组织的关系和角色 | 582 | // 如果为普通租户绑定用户和组织的关系和角色 |
| 583 | - if(null!=level){ | ||
| 584 | - //如果是普通租户 | ||
| 585 | - if(level==FastIotConstants.LevelValue.IS_CUSTOMER_TENANT){ | ||
| 586 | - for (String tenantRole : userDTO.getRoleIds()) { | ||
| 587 | - roleMapper.saveUserRoleMapping(user.getId(), tenantRole); | ||
| 588 | - } | ||
| 589 | - } | ||
| 590 | - //如果是openapi用户 | ||
| 591 | - if(level==FastIotConstants.LevelValue.IS_OPENAPI_USER){ | ||
| 592 | - for (String tenantRole : userDTO.getRoleIds()) { | ||
| 593 | - roleMapper.saveUserRoleMapping(user.getId(), tenantRole); | ||
| 594 | - } | 583 | + if (null!=level&&(level== FastIotConstants.MagicNumber.FOUR||level==FastIotConstants.LevelValue.IS_OPENAPI_USER)){ |
| 584 | + //如果是普通租户或者openapi用户 | ||
| 585 | + for (String tenantRole : userDTO.getRoleIds()) { | ||
| 586 | + roleMapper.saveUserRoleMapping(user.getId(), tenantRole); | ||
| 595 | } | 587 | } |
| 596 | organizationService.bindUserToOrganization( | 588 | organizationService.bindUserToOrganization( |
| 597 | tenantId, user.getId(), userDTO.getOrganizationIds()); | 589 | tenantId, user.getId(), userDTO.getOrganizationIds()); |