From 2d366e4500bfecdb0d7d60986d98193d04d11214 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=BC=98=E6=98=8A?= Date: Wed, 18 Oct 2023 15:45:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=B6=85=E7=BA=A7=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java | 2 +- ...teSuperAminRoleParam.java => CreateSuperAdminRoleParam.java} | 2 +- .../axzo/tyr/server/controller/roleuser/RoleUserController.java | 2 +- .../java/cn/axzo/tyr/server/service/SaasRoleUserService.java | 2 +- .../java/cn/axzo/tyr/server/service/impl/RoleUserService.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/req/{CreateSuperAminRoleParam.java => CreateSuperAdminRoleParam.java} (96%) diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java index 27ae8006..548fd6ec 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/feign/TyrSaasRoleUserApi.java @@ -60,7 +60,7 @@ public interface TyrSaasRoleUserApi { ApiResult createAgencyAdminRole(@RequestBody @Valid CreateAgencyAdminRoleParam param); @PostMapping("/api/saas-role-user/create-super-admin-role") - ApiResult createSuperAdminRole(@RequestBody @Valid @NotEmpty CreateSuperAminRoleParam param); + ApiResult createSuperAdminRole(@RequestBody @Valid @NotEmpty CreateSuperAdminRoleParam param); /** * 移除超管角色 diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/req/CreateSuperAminRoleParam.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/req/CreateSuperAdminRoleParam.java similarity index 96% rename from tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/req/CreateSuperAminRoleParam.java rename to tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/req/CreateSuperAdminRoleParam.java index 57c353f5..37714d17 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/req/CreateSuperAminRoleParam.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/req/CreateSuperAdminRoleParam.java @@ -7,7 +7,7 @@ import lombok.Data; import javax.validation.constraints.NotNull; @Data -public class CreateSuperAminRoleParam { +public class CreateSuperAdminRoleParam { /** * 工作台id，与context校验 diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java index 36a711be..cb781a2a 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java @@ -61,7 +61,7 @@ public class RoleUserController implements TyrSaasRoleUserApi { } @Override - public ApiResult createSuperAdminRole(CreateSuperAminRoleParam param) { + public ApiResult createSuperAdminRole(CreateSuperAdminRoleParam param) { saasRoleUserService.createSuperAdminRole(param); return ApiResult.ok(); } diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java index 344ba36e..12bc37f0 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/SaasRoleUserService.java @@ -62,7 +62,7 @@ public interface SaasRoleUserService { * workpaceId + ownerOuId + roleId + 手机号 + 姓名 赋予角色（支持角色赋予的同时 角色创建） * work for: 组织 + 服务包 */ - void createSuperAdminRole(CreateSuperAminRoleParam param); + void createSuperAdminRole(CreateSuperAdminRoleParam param); /** * 批量获取超管信息 diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java index f2b92ea4..a3bdeff9 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java @@ -149,7 +149,7 @@ public class RoleUserService implements SaasRoleUserService { @Override @Transactional(rollbackFor = Exception.class) - public void createSuperAdminRole(CreateSuperAminRoleParam param) { + public void createSuperAdminRole(CreateSuperAdminRoleParam param) { //获取超管角色 SaasRole saasRole = saasRoleDao .findRoleByTypeAndWorkspaceIdAndOuId(RoleTypeEnum.SUPER_ADMIN.getValue(),