diff --git a/auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nController.java b/auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nController.java index 41d422c..f318c4d 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/configuration/I18nController.java @@ -54,22 +54,22 @@ public class I18nController { return Result.success(vo); } - @Operation(summary = "添加多语言", description = "添加多语言") - @PermissionTag(permission = "i18n:add") - @PostMapping() - public Result createI18n(@Validated(ValidationGroups.Update.class) @RequestBody I18nDto dto) { - i18nService.createI18n(dto); - return Result.success(ResultCodeEnum.CREATE_SUCCESS); - } - @Operation(summary = "更新多语言", description = "更新多语言") @PermissionTag(permission = "i18n:update") @PutMapping() - public Result updateI18n(@Validated(ValidationGroups.Add.class) @RequestBody I18nDto dto) { + public Result updateI18n(@Validated(ValidationGroups.Update.class) @RequestBody I18nDto dto) { i18nService.updateI18n(dto); return Result.success(ResultCodeEnum.UPDATE_SUCCESS); } + @Operation(summary = "添加多语言", description = "添加多语言") + @PermissionTag(permission = "i18n:add") + @PostMapping() + public Result createI18n(@Validated(ValidationGroups.Add.class) @RequestBody I18nDto dto) { + i18nService.createI18n(dto); + return Result.success(ResultCodeEnum.CREATE_SUCCESS); + } + @Operation(summary = "删除多语言", description = "删除多语言") @PermissionTag(permission = "i18n:delete") @DeleteMapping() diff --git a/auth-api/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java b/auth-api/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java index ec609f9..768dae7 100644 --- a/auth-api/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java +++ b/auth-api/src/main/java/cn/bunny/services/controller/system/RolePermissionController.java @@ -39,8 +39,8 @@ public class RolePermissionController { @Operation(summary = "为角色分配权限", description = "为角色分配权限") @PermissionTag(permission = "rolePermission:update") @PostMapping() - public Result addRolPermission(@Valid @RequestBody AssignPowersToRoleDto dto) { - rolePermissionService.addRolPermission(dto); + public Result saveRolPermission(@Valid @RequestBody AssignPowersToRoleDto dto) { + rolePermissionService.saveRolPermission(dto); return Result.success(); } } diff --git a/auth-core/src/main/java/cn/bunny/services/domain/files/dto/FilesCreateOrUpdateDto.java b/auth-core/src/main/java/cn/bunny/services/domain/files/dto/FilesCreateOrUpdateDto.java index 6d540fa..e20568b 100644 --- a/auth-core/src/main/java/cn/bunny/services/domain/files/dto/FilesCreateOrUpdateDto.java +++ b/auth-core/src/main/java/cn/bunny/services/domain/files/dto/FilesCreateOrUpdateDto.java @@ -36,7 +36,6 @@ public class FilesCreateOrUpdateDto { private List files; @Schema(name = "file", title = "文件,修改时为 file") - @NotNull(message = "文件不能为空", groups = {ValidationGroups.Update.class}) private MultipartFile file; } \ No newline at end of file diff --git a/service/src/main/java/cn/bunny/services/service/system/RolePermissionService.java b/service/src/main/java/cn/bunny/services/service/system/RolePermissionService.java index 7deaebe..c03793e 100644 --- a/service/src/main/java/cn/bunny/services/service/system/RolePermissionService.java +++ b/service/src/main/java/cn/bunny/services/service/system/RolePermissionService.java @@ -29,5 +29,5 @@ public interface RolePermissionService extends IService { * * @param powerIds 权限id */ - void addRolPermission(AssignPowersToRoleDto powerIds); + void saveRolPermission(AssignPowersToRoleDto powerIds); } diff --git a/service/src/main/java/cn/bunny/services/service/system/impl/RolePermissionServiceImpl.java b/service/src/main/java/cn/bunny/services/service/system/impl/RolePermissionServiceImpl.java index 50f524b..e4bbca3 100644 --- a/service/src/main/java/cn/bunny/services/service/system/impl/RolePermissionServiceImpl.java +++ b/service/src/main/java/cn/bunny/services/service/system/impl/RolePermissionServiceImpl.java @@ -59,13 +59,14 @@ public class RolePermissionServiceImpl extends ServiceImpl powerIds = dto.getPowerIds(); Long roleId = dto.getRoleId(); // 删除这个角色下所有权限 List ids = List.of(roleId); - baseMapper.deleteBatchRoleIds(ids); + removeByIds(ids); + // baseMapper.deleteBatchRoleIds(ids); // 保存分配数据 List rolePermissionList = powerIds.stream().map(powerId -> {