From c3eb1b9f771040a23d1c4c2e1e324e136b474d74 Mon Sep 17 00:00:00 2001 From: guosl Date: Tue, 30 Jul 2024 14:38:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/service/role/role.go | 3 ++- server/role/role.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/internal/service/role/role.go b/internal/service/role/role.go index d353608..f1c515b 100644 --- a/internal/service/role/role.go +++ b/internal/service/role/role.go @@ -81,12 +81,13 @@ func (o *roleService) Role(ctx context.Context, info *roleModel.GetReq) (role ro func (o *roleService) Search(ctx context.Context, info *roleModel.Query) ([]roleModel.Role, error) { dbQuery := repo.Query{} copier.Copy(&dbQuery, info) + dbRoles, err := o.roleRepo.Search(ctx, dbQuery) if err != nil { return nil, err } - roles := make([]roleModel.Role, len(dbRoles)) + roles := make([]roleModel.Role, 0, len(dbRoles)) for _, role := range dbRoles { roles = append(roles, convertDTM(role)) } diff --git a/server/role/role.go b/server/role/role.go index 00b0766..454441d 100644 --- a/server/role/role.go +++ b/server/role/role.go @@ -33,7 +33,7 @@ func RegisterRoute(api *gin.RouterGroup) { server := do.MustInvoke[*RoleServer](nil) api.POST("/create", ginUtil.WrapNoRsp(server.Create)) api.POST("/save", ginUtil.WrapNoRsp(server.Save)) - api.POST("/delete", ginUtil.WrapNoRsp(server.DelRole)) + api.DELETE("/delete", ginUtil.WrapNoRsp(server.DelRole)) api.GET("/get", ginUtil.Wrap(server.Role)) api.GET("/search", ginUtil.Wrap(server.Search)) } @@ -56,6 +56,7 @@ func (u *RoleServer) Role(ctx context.Context, info *roleModel.GetReq) (roleMode } func (u *RoleServer) Search(ctx context.Context, info *roleModel.Query) ([]roleModel.Role, error) { + info.Default() return u.roleService.Search(ctx, info) }