|
@@ -51,13 +51,13 @@ public class SysUserRoleV2ServiceImpl extends ServiceImpl<SysUserRoleDao, SysUse
|
|
|
Long count = sysUserRoleRelationDao.selectCount(queryWrapper);
|
|
|
roleDetail.setUser_count(Convert.toInt(count));
|
|
|
|
|
|
- // 查询角色对应的模块
|
|
|
- List<SysUserRolePermission> modules = sysUserRolePermissionRelationDao.selectUserRolePermissionByRoleId(role_id);
|
|
|
+ // 查询角色对应的权限
|
|
|
+ List<SysUserRolePermission> permissions = sysUserRolePermissionRelationDao.selectUserRolePermissionByRoleId(role_id);
|
|
|
|
|
|
- System.out.println("modules:");
|
|
|
- System.out.println(modules);
|
|
|
+ System.out.println("permissions:");
|
|
|
+ System.out.println(permissions);
|
|
|
|
|
|
- roleDetail.setPermissions(modules);
|
|
|
+ roleDetail.setPermissions(permissions);
|
|
|
|
|
|
return roleDetail;
|
|
|
}
|
|
@@ -69,12 +69,12 @@ public class SysUserRoleV2ServiceImpl extends ServiceImpl<SysUserRoleDao, SysUse
|
|
|
// 判断 modules 是否重复
|
|
|
List<String> permissionIds = sysUserRole.getPermission_ids();
|
|
|
if (CollUtil.isNotEmpty(permissionIds) && permissionIds.size() != CollUtil.distinct(permissionIds).size()) {
|
|
|
- throw new CustException("模块ID出现重复值");
|
|
|
+ throw new CustException("权限ID出现重复值");
|
|
|
}
|
|
|
|
|
|
// 创建角色
|
|
|
sysUserRoleDao.insertUserRole(sysUserRole);
|
|
|
- // 创建角色与模块关系
|
|
|
+ // 创建角色与权限关系
|
|
|
sysUserRoleDao.insertUserRolePermissionRelation(sysUserRole);
|
|
|
|
|
|
return Map.of("role_id", sysUserRole.getId());
|
|
@@ -87,7 +87,7 @@ public class SysUserRoleV2ServiceImpl extends ServiceImpl<SysUserRoleDao, SysUse
|
|
|
// 判断 modules 是否重复
|
|
|
List<String> permissionIds = sysUserRole.getPermission_ids();
|
|
|
if (CollUtil.isNotEmpty(permissionIds) && permissionIds.size() != CollUtil.distinct(permissionIds).size()) {
|
|
|
- throw new CustException("模块ID出现重复值");
|
|
|
+ throw new CustException("权限ID出现重复值");
|
|
|
}
|
|
|
|
|
|
SysUserRole detail = sysUserRoleDao.selectById(sysUserRole.getRole_id());
|
|
@@ -95,7 +95,7 @@ public class SysUserRoleV2ServiceImpl extends ServiceImpl<SysUserRoleDao, SysUse
|
|
|
|
|
|
// 更新角色
|
|
|
sysUserRoleDao.updateUserRole(sysUserRole);
|
|
|
- // 更新角色与模块关系 (需要先删除全部,再重新插入)
|
|
|
+ // 更新角色与权限关系 (需要先删除全部,再重新插入)
|
|
|
sysUserRoleDao.updateUserRolePermissionRelation(sysUserRole);
|
|
|
|
|
|
return Map.of("role_id", sysUserRole.getRole_id());
|
|
@@ -115,7 +115,7 @@ public class SysUserRoleV2ServiceImpl extends ServiceImpl<SysUserRoleDao, SysUse
|
|
|
|
|
|
// 删除角色
|
|
|
sysUserRoleDao.delete(new LambdaQueryWrapper<SysUserRole>().eq(SysUserRole::getRole_id, role_id));
|
|
|
- // 删除角色与模块关系
|
|
|
+ // 删除角色与权限关系
|
|
|
sysUserRolePermissionRelationDao.delete(new LambdaQueryWrapper<SysUserRolePermissionRelation>().eq(SysUserRolePermissionRelation::getRole_id, role_id));
|
|
|
|
|
|
return Map.of("role_id", sysUserRole.getRole_id());
|