...

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/RolePrivilegeController.java

@@ -89,12 +89,17 @@ public class RolePrivilegeController extends ControllerSupport {
 	@PostMapping("getRoles")
 	public List<RoleBean> getRoles(@RequestParam Boolean includeSuperAdmin,
 			@RequestParam Long rootOrgId) {
+		User accessUser = getAccessUser();
+
 		List<RoleEntity> roleList = roleRepo.findByRootOrgIdIsNull();
+
 		if (null != rootOrgId) {
 			validateRootOrgIsolation(rootOrgId);
-
 			List<RoleEntity> rootOrgRoleList = roleRepo.findByRootOrgId(rootOrgId);
 			roleList.addAll(rootOrgRoleList);
+		} else {
+			List<RoleEntity> rootOrgRoleList = roleRepo.findByRootOrgId(accessUser.getRootOrgId());
+			roleList.addAll(rootOrgRoleList);
 		}
 		List<RoleBean> roleBeanList = Lists.newArrayList();