From aa791d327524cf7f13511d3357aed5923ba9a704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?bug=E6=90=AC=E8=BF=90=E5=B7=A5?= Date: Sat, 13 May 2023 17:57:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?:bug:=20=E5=A2=9E=E5=8A=A0=E8=A7=92?= =?UTF-8?q?=E8=89=B2code=E6=A3=80=E6=B5=8B,=E9=98=B2=E6=AD=A2=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=B7=B2=E5=AD=98=E5=9C=A8=E7=9A=84code=E6=97=B6?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/SysRoleService.java | 14 ++++++++++ .../service/impl/SysRoleServiceImpl.java | 26 +++++++++++++++++++ .../system/controller/SysRoleController.java | 2 +- 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/ballcat-system/ballcat-system-biz/src/main/java/com/hccake/ballcat/system/service/SysRoleService.java b/ballcat-system/ballcat-system-biz/src/main/java/com/hccake/ballcat/system/service/SysRoleService.java index 2e3c93303..d5022a616 100644 --- a/ballcat-system/ballcat-system-biz/src/main/java/com/hccake/ballcat/system/service/SysRoleService.java +++ b/ballcat-system/ballcat-system-biz/src/main/java/com/hccake/ballcat/system/service/SysRoleService.java @@ -34,4 +34,18 @@ public interface SysRoleService extends ExtendService { */ List> listSelectData(); + /** + * 是否存在角色code + * @param roleCode 角色code + * @return boolean 是否存在 + */ + boolean existsRoleCode(String roleCode); + + /** + * 新增角色 + * @param sysRole 角色对象 + * @return boolean 是否新增成功 + */ + boolean roleSave(SysRole sysRole); + } diff --git a/ballcat-system/ballcat-system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysRoleServiceImpl.java b/ballcat-system/ballcat-system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysRoleServiceImpl.java index 8cd6b0df0..939fb7158 100644 --- a/ballcat-system/ballcat-system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysRoleServiceImpl.java +++ b/ballcat-system/ballcat-system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysRoleServiceImpl.java @@ -1,6 +1,9 @@ package com.hccake.ballcat.system.service.impl; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; +import com.hccake.ballcat.common.core.exception.BusinessException; +import com.hccake.ballcat.common.model.result.BaseResultCode; import com.hccake.ballcat.system.mapper.SysRoleMapper; import com.hccake.ballcat.system.model.entity.SysRole; import com.hccake.ballcat.system.model.qo.SysRoleQO; @@ -65,4 +68,27 @@ public List> listSelectData() { return baseMapper.listSelectData(); } + /** + * 是否存在角色code + * @param roleCode 角色code + * @return boolean 是否存在 + */ + @Override + public boolean existsRoleCode(String roleCode) { + return baseMapper.exists(Wrappers.lambdaQuery(SysRole.class).eq(SysRole::getCode, roleCode)); + } + + /** + * 新增角色 + * @param sysRole 角色对象 + * @return boolean 是否新增成功 + */ + @Override + public boolean roleSave(SysRole sysRole) { + if (existsRoleCode(sysRole.getCode())) { + throw new BusinessException(BaseResultCode.LOGIC_CHECK_ERROR, "角色标识已存在！"); + } + return this.save(sysRole); + } + } diff --git a/ballcat-system/ballcat-system-controller/src/main/java/com/hccake/ballcat/system/controller/SysRoleController.java b/ballcat-system/ballcat-system-controller/src/main/java/com/hccake/ballcat/system/controller/SysRoleController.java index dcf3da00d..18066488e 100644 --- a/ballcat-system/ballcat-system-controller/src/main/java/com/hccake/ballcat/system/controller/SysRoleController.java +++ b/ballcat-system/ballcat-system-controller/src/main/java/com/hccake/ballcat/system/controller/SysRoleController.java @@ -89,7 +89,7 @@ public R getById(@PathVariable("id") Integer id) { @PreAuthorize("@per.hasPermission('system:role:add')") @Operation(summary = "新增系统角色", description = "新增系统角色") public R save(@Valid @RequestBody SysRole sysRole) { - return R.ok(sysRoleService.save(sysRole)); + return sysRoleService.roleSave(sysRole) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "新建角色失败"); } /** From 611e932a21dd087dce7ac052c94078e8126ce202 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?bug=E6=90=AC=E8=BF=90=E5=B7=A5?= Date: Mon, 15 May 2023 11:46:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?:bug:=20=E5=A2=9E=E5=8A=A0=E8=A7=92?= =?UTF-8?q?=E8=89=B2code=E6=A3=80=E6=B5=8B,=E9=98=B2=E6=AD=A2=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=B7=B2=E5=AD=98=E5=9C=A8=E7=9A=84code=E6=97=B6?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hccake/ballcat/system/mapper/SysRoleMapper.java | 11 +++++++++++ .../hccake/ballcat/system/service/SysRoleService.java | 7 ------- .../system/service/impl/SysRoleServiceImpl.java | 6 +++--- .../ballcat/system/controller/SysRoleController.java | 2 +- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ballcat-system/ballcat-system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysRoleMapper.java b/ballcat-system/ballcat-system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysRoleMapper.java index dd980d739..47e235b36 100644 --- a/ballcat-system/ballcat-system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysRoleMapper.java +++ b/ballcat-system/ballcat-system-biz/src/main/java/com/hccake/ballcat/system/mapper/SysRoleMapper.java @@ -49,4 +49,15 @@ default PageResult queryPage(PageParam pageParam, SysRoleQO qo) { */ List> listSelectData(); + /** + * 是否存在角色code + * @param roleCode 角色code + * @return boolean 是否存在 + */ + default boolean existsRoleCode(String roleCode) { + LambdaQueryWrapperX wrapperX = new LambdaQueryWrapperX<>(); + wrapperX.eq(SysRole::getCode, roleCode); + return this.selectCount(wrapperX) > 0L; + } + } diff --git a/ballcat-system/ballcat-system-biz/src/main/java/com/hccake/ballcat/system/service/SysRoleService.java b/ballcat-system/ballcat-system-biz/src/main/java/com/hccake/ballcat/system/service/SysRoleService.java index d5022a616..8afbb4c92 100644 --- a/ballcat-system/ballcat-system-biz/src/main/java/com/hccake/ballcat/system/service/SysRoleService.java +++ b/ballcat-system/ballcat-system-biz/src/main/java/com/hccake/ballcat/system/service/SysRoleService.java @@ -41,11 +41,4 @@ public interface SysRoleService extends ExtendService { */ boolean existsRoleCode(String roleCode); - /** - * 新增角色 - * @param sysRole 角色对象 - * @return boolean 是否新增成功 - */ - boolean roleSave(SysRole sysRole); - } diff --git a/ballcat-system/ballcat-system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysRoleServiceImpl.java b/ballcat-system/ballcat-system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysRoleServiceImpl.java index 939fb7158..922f6baa0 100644 --- a/ballcat-system/ballcat-system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysRoleServiceImpl.java +++ b/ballcat-system/ballcat-system-biz/src/main/java/com/hccake/ballcat/system/service/impl/SysRoleServiceImpl.java @@ -75,7 +75,7 @@ public List> listSelectData() { */ @Override public boolean existsRoleCode(String roleCode) { - return baseMapper.exists(Wrappers.lambdaQuery(SysRole.class).eq(SysRole::getCode, roleCode)); + return baseMapper.existsRoleCode(roleCode); } /** @@ -84,11 +84,11 @@ public boolean existsRoleCode(String roleCode) { * @return boolean 是否新增成功 */ @Override - public boolean roleSave(SysRole sysRole) { + public boolean save(SysRole sysRole) { if (existsRoleCode(sysRole.getCode())) { throw new BusinessException(BaseResultCode.LOGIC_CHECK_ERROR, "角色标识已存在！"); } - return this.save(sysRole); + return SqlHelper.retBool(getBaseMapper().insert(sysRole)); } } diff --git a/ballcat-system/ballcat-system-controller/src/main/java/com/hccake/ballcat/system/controller/SysRoleController.java b/ballcat-system/ballcat-system-controller/src/main/java/com/hccake/ballcat/system/controller/SysRoleController.java index 18066488e..03b398455 100644 --- a/ballcat-system/ballcat-system-controller/src/main/java/com/hccake/ballcat/system/controller/SysRoleController.java +++ b/ballcat-system/ballcat-system-controller/src/main/java/com/hccake/ballcat/system/controller/SysRoleController.java @@ -89,7 +89,7 @@ public R getById(@PathVariable("id") Integer id) { @PreAuthorize("@per.hasPermission('system:role:add')") @Operation(summary = "新增系统角色", description = "新增系统角色") public R save(@Valid @RequestBody SysRole sysRole) { - return sysRoleService.roleSave(sysRole) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "新建角色失败"); + return sysRoleService.save(sysRole) ? R.ok() : R.failed(BaseResultCode.UPDATE_DATABASE_ERROR, "新建角色失败"); } /**