Commit 51bcc697 authored by haoyanbin's avatar haoyanbin

1

parent b3491d06
...@@ -11,7 +11,6 @@ import ( ...@@ -11,7 +11,6 @@ import (
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response" _ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
"go-admin/app/operate/models"
"go-admin/app/operate/service" "go-admin/app/operate/service"
"go-admin/app/operate/service/dto" "go-admin/app/operate/service/dto"
"go-admin/common/actions" "go-admin/common/actions"
...@@ -79,7 +78,7 @@ func (e OrgTeamUser) Get(c *gin.Context) { ...@@ -79,7 +78,7 @@ func (e OrgTeamUser) Get(c *gin.Context) {
e.Error(500, err, err.Error()) e.Error(500, err, err.Error())
return return
} }
var object models.OrgTeamUser var object dto.OrgTeamUserGetReply
p := actions.GetPermissionFromContext(c) p := actions.GetPermissionFromContext(c)
err = s.Get(&req, p, &object) err = s.Get(&req, p, &object)
......
...@@ -45,15 +45,15 @@ func (e *OrgTeamUser) GetPage(c *dto.OrgTeamUserGetPageReq, p *actions.DataPermi ...@@ -45,15 +45,15 @@ func (e *OrgTeamUser) GetPage(c *dto.OrgTeamUserGetPageReq, p *actions.DataPermi
} }
// Get 获取OrgTeamUser对象 // Get 获取OrgTeamUser对象
func (e *OrgTeamUser) Get(d *dto.OrgTeamUserGetReq, p *actions.DataPermission, model *models.OrgTeamUser) error { func (e *OrgTeamUser) Get(d *dto.OrgTeamUserGetReq, p *actions.DataPermission, model *dto.OrgTeamUserGetReply) error {
field := "oc.club_name, ot.team_id, ot.team_name, otu.name, otu.sex, otu.user_img, otu.sign_img, sr.role_id, sr.role_name, su.username, su.status" field := "otu.id,oc.club_name, otu.team_id, ot.team_name, otu.name, otu.sex, otu.user_img, otu.sign_img, sr.role_id, sr.role_name, su.username, su.status"
err := e.Orm.Table("org_team_user as otu"). err := e.Orm.Table("org_team_user as otu").
Select(field). Select(field).
Joins("org_team as ot on otu.team_id=ot.id"). Joins("left join org_team as ot on otu.team_id=ot.id").
Joins("org_club as oc on otu.club_id=oc.id"). Joins("left join org_club as oc on otu.club_id=oc.id").
Joins("sys_user as su on otu.user_id=su.id"). Joins("left join sys_user as su on otu.user_id=su.user_id").
Joins("sys_role as sr on su.role_id=sr.role_id"). Joins("left join sys_role as sr on su.role_id=sr.role_id").
First(model, d.GetId()).Error First(model, d.GetId()).Error
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
err = errors.New("查看对象不存在或无权查看") err = errors.New("查看对象不存在或无权查看")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment