From e1c211666b9fb7e0982ce2729668fc5102f2608e Mon Sep 17 00:00:00 2001
From: xiangheng <11675084@qq.com>
Date: Mon, 29 Apr 2024 14:24:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A7=92=E8=89=B2=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E8=8F=9C=E5=8D=95=E6=97=B6=E8=8E=B7=E5=8F=96=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/admin/system/role/perm_service.go | 6 +++---
 server/admin/system/role/service.go      | 2 +-
 server/core/response/response.go         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/admin/system/role/perm_service.go b/server/admin/system/role/perm_service.go
index 7c2271c..e11bd71 100644
--- a/server/admin/system/role/perm_service.go
+++ b/server/admin/system/role/perm_service.go
@@ -37,12 +37,12 @@ type systemAuthPermService struct {
 func (service systemAuthPermService) SelectMenuIdsByRoleId(roleId uint) (menuIds []uint, e error) {
 	var role system_model.SystemAuthRole
 	err := service.db.Where("id = ? AND is_disable = ?", roleId, 0).Limit(1).First(&role).Error
-	if e = response.CheckErr(err, "SelectMenuIdsByRoleId First err"); e != nil {
+	if e = response.CheckErr(err, "角色不存在"); e != nil {
 		return []uint{}, e
 	}
 	var perms []system_model.SystemAuthPerm
 	err = service.db.Where("role_id = ?", role.ID).Find(&perms).Error
-	if e = response.CheckErr(err, "SelectMenuIdsByRoleId Find err"); e != nil {
+	if e = response.CheckErr(err, "查询角色的菜单失败"); e != nil {
 		return []uint{}, e
 	}
 	for _, perm := range perms {
@@ -55,7 +55,7 @@ func (service systemAuthPermService) SelectMenuIdsByRoleId(roleId uint) (menuIds
 func (service systemAuthPermService) CacheRoleMenusByRoleId(roleId uint) (e error) {
 	var perms []system_model.SystemAuthPerm
 	err := service.db.Where("role_id = ?", roleId).Find(&perms).Error
-	if e = response.CheckErr(err, "CacheRoleMenusByRoleId Find perms err"); e != nil {
+	if e = response.CheckErr(err, "查询角色的菜单失败"); e != nil {
 		return
 	}
 	var menuIds []uint
diff --git a/server/admin/system/role/service.go b/server/admin/system/role/service.go
index fac1337..3797782 100644
--- a/server/admin/system/role/service.go
+++ b/server/admin/system/role/service.go
@@ -88,7 +88,7 @@ func (roleSrv systemAuthRoleService) Detail(id uint) (res SystemAuthRoleResp, e
 	}
 	response.Copy(&res, role)
 	res.Member = roleSrv.getMemberCnt(role.ID)
-	res.Menus, e = PermService.SelectMenuIdsByRoleId(role.ID)
+	res.Menus, _ = PermService.SelectMenuIdsByRoleId(role.ID)
 	return
 }
 
diff --git a/server/core/response/response.go b/server/core/response/response.go
index ff18ea1..7764160 100644
--- a/server/core/response/response.go
+++ b/server/core/response/response.go
@@ -205,7 +205,7 @@ func CheckMysqlErr(err error) (e error) {
 		switch mysqlErr.Number {
 		case 404:
 			core.Logger.WithOptions(zap.AddCallerSkip(1)).Errorf("record not found: err=[%+v]", err)
-			return SystemError.Make("record not found")
+			return SystemError.Make("数据不存在")
 		case 1062: // MySQL中表示重复条目的代码
 			core.Logger.WithOptions(zap.AddCallerSkip(1)).Infof("数据已存在: err=[%+v]", err)
 			return SystemError.Make("数据已存在")