src/main/java/org/springblade/modules/system/controller/RoleController.java
@@ -33,7 +33,6 @@ import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springblade.core.tool.constant.BladeConstant; import org.springblade.core.tool.constant.RoleConstant; import org.springblade.core.tool.utils.Func; import org.springblade.modules.system.entity.Role; import org.springblade.modules.system.entity.User; @@ -60,7 +59,7 @@ @AllArgsConstructor @RequestMapping(AppConstant.APPLICATION_SYSTEM_NAME + "/role") @Api(value = "角色", tags = "角色") @PreAuth(RoleConstant.HAS_ROLE_ADMIN) //@PreAuth(RoleConstant.HAS_ROLE_ADMIN) public class RoleController extends BladeController { private final IRoleService roleService; src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -124,7 +124,7 @@ }) @ApiOperationSupport(order = 3) @ApiOperation(value = "列表", notes = "传入account和realName") @PreAuth(RoleConstant.HAS_ROLE_ADMIN) // @PreAuth(RoleConstant.HAS_ROLE_ADMIN) public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) { IPage<User> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId())); return R.data(UserWrapper.build().pageVO(pages));