板块创建成功

Backend/internal/logic/user/user.go

@@ -1,12 +1,12 @@
 package user
 
 import (
-	"context"
 	v1 "TrangleAgent/api/user/v1"
 	"TrangleAgent/internal/dao"
 	"TrangleAgent/internal/model"
 	"TrangleAgent/internal/model/entity"
 	"TrangleAgent/internal/service"
+	"context"
 
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
@@ -77,7 +77,7 @@ func (s *sUser) UserList(ctx context.Context, req *v1.UserListReq) (res *v1.User
 	req.PageResult.Page = req.Page
 	req.PageResult.PageSize = req.PageSize
 
-	return
+	return res, nil
 }
 
 func (s *sUser) UserView(ctx context.Context, req *v1.UserViewReq) (res *v1.UserViewRes, err error) {
@@ -92,10 +92,10 @@ func (s *sUser) UserView(ctx context.Context, req *v1.UserViewReq) (res *v1.User
 	res = &v1.UserViewRes{}
 	err = m.Scan(&res.UserViewParams)
 	if err != nil {
-		return nil, err
+		return nil, gerror.Wrap(err, "查询用户信息失败")
 	}
 
-	return
+	return res, nil
 }
 
 func (s *sUser) UserUpdate(ctx context.Context, req *v1.UserUpdateReq) (res *v1.UserUpdateRes, err error) {
@@ -105,28 +105,28 @@ func (s *sUser) UserUpdate(ctx context.Context, req *v1.UserUpdateReq) (res *v1.
 	// 根据账号更新用户信息
 	_, err = m.Data(req).Where(dao.Users.Columns().Account, req.Account).Update()
 	if err != nil {
-		return nil, err
+		return nil, gerror.Wrap(err, "更新用户信息失败")
 	}
 
 	res = &v1.UserUpdateRes{}
 	// 获取更新后的用户信息
 	err = m.Where(dao.Users.Columns().Account, req.Account).Scan(&res)
 	if err != nil {
-		return nil, err
+		return nil, gerror.Wrap(err, "查询用户信息失败")
 	}
 
-	return
+	return res, nil
 }
 
 func (s *sUser) UserDelete(ctx context.Context, req *v1.UserDeleteReq) (res *v1.UserDeleteRes, err error) {
 	// 根据账号删除用户
 	_, err = dao.Users.Ctx(ctx).Where(dao.Users.Columns().Account, req.Account).Delete()
 	if err != nil {
-		return nil, err
+		return nil, gerror.Wrap(err, "删除用户失败")
 	}
 
 	res = &v1.UserDeleteRes{}
-	return
+	return res, nil
 }
 
 // RoleCreate 创建角色
@@ -145,13 +145,13 @@ func (s *sUser) RoleCreate(ctx context.Context, req *v1.RoleCreateReq) (res *v1.
 
 	id, err := dao.RoleCards.Ctx(ctx).Data(data).InsertAndGetId()
 	if err != nil {
-		return nil, err
+		return nil, gerror.Wrap(err, "创建角色失败")
 	}
 
 	res = &v1.RoleCreateRes{
 		Id: uint64(id),
 	}
-	return
+	return res, nil
 }
 
 // RoleUpdate 更新角色
@@ -174,13 +174,13 @@ func (s *sUser) RoleUpdate(ctx context.Context, req *v1.RoleUpdateReq) (res *v1.
 
 	_, err = dao.RoleCards.Ctx(ctx).Data(data).Where(dao.RoleCards.Columns().Id, req.Id).Update()
 	if err != nil {
-		return nil, err
+		return nil, gerror.Wrap(err, "更新角色失败")
 	}
 
 	res = &v1.RoleUpdateRes{
 		Id: req.Id,
 	}
-	return
+	return res, nil
 }
 
 // RoleView 查看角色详情
@@ -189,7 +189,7 @@ func (s *sUser) RoleView(ctx context.Context, req *v1.RoleViewReq) (res *v1.Role
 	var role entity.RoleCards
 	err = dao.RoleCards.Ctx(ctx).Where(dao.RoleCards.Columns().Id, req.Id).Scan(&role)
 	if err != nil {
-		return nil, err
+		return nil, gerror.Wrap(err, "查询角色详情失败")
 	}
 
 	res = &v1.RoleViewRes{
@@ -219,7 +219,7 @@ func (s *sUser) RoleView(ctx context.Context, req *v1.RoleViewReq) (res *v1.Role
 			QaDiscretion:   role.QaDiscretion,
 		},
 	}
-	return
+	return res, nil
 }
 
 // RoleList 获取角色列表
@@ -293,7 +293,7 @@ func (s *sUser) RoleList(ctx context.Context, req *v1.RoleListReq) (res *v1.Role
 	req.PageResult.Page = req.Page
 	req.PageResult.PageSize = req.PageSize
 
-	return
+	return res, nil
 }
 
 // RoleDelete 删除角色
@@ -301,13 +301,13 @@ func (s *sUser) RoleDelete(ctx context.Context, req *v1.RoleDeleteReq) (res *v1.
 	// 根据ID删除角色
 	_, err = dao.RoleCards.Ctx(ctx).Where(dao.RoleCards.Columns().Id, req.Id).Delete()
 	if err != nil {
-		return nil, err
+		return nil, gerror.Wrap(err, "删除角色失败")
 	}
 
 	res = &v1.RoleDeleteRes{
 		Id: req.Id,
 	}
-	return
+	return res, nil
 }
 
 // RolePermissionCheck 权限查询
@@ -316,7 +316,7 @@ func (s *sUser) RolePermissionCheck(ctx context.Context, req *v1.RolePermissionC
 	var role entity.RoleCards
 	err = dao.RoleCards.Ctx(ctx).Where(dao.RoleCards.Columns().Id, req.RoleId).Scan(&role)
 	if err != nil {
-		return nil, err
+		return nil, gerror.Wrap(err, "查询角色信息失败")
 	}
 
 	// 根据轨道类型获取对应的轨道值
@@ -343,5 +343,9 @@ func (s *sUser) RolePermissionCheck(ctx context.Context, req *v1.RolePermissionC
 	}
 
 	// 权限不足，返回错误
-	return nil, gerror.New("权限不足")
+	res = &v1.RolePermissionCheckRes{
+		Code: 403,
+		Mes:  "权限不足",
+	}
+	return res, nil
 }