Commit ceb0efa5 authored by haoyanbin's avatar haoyanbin

1

parent 7606c505
...@@ -20,6 +20,13 @@ type OrgTeam struct { ...@@ -20,6 +20,13 @@ type OrgTeam struct {
api.Api api.Api
} }
func (e OrgTeam) getClubId(c *gin.Context) string {
sOrgTeamUser := service.OrgClubUser{}
e.MakeContext(c).MakeOrm().MakeService(&sOrgTeamUser.Service)
_, teamId := sOrgTeamUser.GetClubId(user.GetUserId(c))
return teamId
}
// GetPage <球队>获取球队列表 // GetPage <球队>获取球队列表
// @Summary <球队>获取球队列表 // @Summary <球队>获取球队列表
// @Description <球队>获取球队列表 // @Description <球队>获取球队列表
...@@ -48,6 +55,8 @@ func (e OrgTeam) GetPage(c *gin.Context) { ...@@ -48,6 +55,8 @@ func (e OrgTeam) GetPage(c *gin.Context) {
list := make([]dto.OrgTeamGetPageReply, 0) list := make([]dto.OrgTeamGetPageReply, 0)
var count int64 var count int64
req.ClubId = e.getClubId(c)
err = s.GetPage(&req, p, &list, &count) err = s.GetPage(&req, p, &list, &count)
if err != nil { if err != nil {
e.Error(500, err, fmt.Sprintf("获取球队 失败,\r\n失败信息 %s", err.Error())) e.Error(500, err, fmt.Sprintf("获取球队 失败,\r\n失败信息 %s", err.Error()))
...@@ -136,6 +145,10 @@ func (e OrgTeam) Insert(c *gin.Context) { ...@@ -136,6 +145,10 @@ func (e OrgTeam) Insert(c *gin.Context) {
e.Error(500, err, err.Error()) e.Error(500, err, err.Error())
return return
} }
if req.ClubId == "" || req.TeamName == "" {
e.Error(111, err, "数据有误")
return
}
userId := user.GetUserId(c) userId := user.GetUserId(c)
// 设置创建人 // 设置创建人
req.CreateBy = userId req.CreateBy = userId
......
...@@ -9,6 +9,7 @@ import ( ...@@ -9,6 +9,7 @@ import (
type OrgTeamGetPageReq struct { type OrgTeamGetPageReq struct {
dto.Pagination `search:"-"` dto.Pagination `search:"-"`
ClubId string `form:"clubId" json:"clubId" search:"-"` //球队名称
TeamName string `form:"teamName" json:"teamName" search:"type:contains;column:team_name;table:ot" comment:"球队名称"` //球队名称 TeamName string `form:"teamName" json:"teamName" search:"type:contains;column:team_name;table:ot" comment:"球队名称"` //球队名称
CreateStartTime string `form:"createStartTime" search:"type:gte;column:created_at;table:ot" comment:"开始时间"` //开始时间 CreateStartTime string `form:"createStartTime" search:"type:gte;column:created_at;table:ot" comment:"开始时间"` //开始时间
CreateEndTime string `form:"createEndTime" search:"type:lte;column:created_at;table:ot" comment:"结束时间"` //结束时间 CreateEndTime string `form:"createEndTime" search:"type:lte;column:created_at;table:ot" comment:"结束时间"` //结束时间
......
...@@ -29,6 +29,7 @@ func (e *OrgTeam) GetPage(c *dto.OrgTeamGetPageReq, p *actions.DataPermission, l ...@@ -29,6 +29,7 @@ func (e *OrgTeam) GetPage(c *dto.OrgTeamGetPageReq, p *actions.DataPermission, l
cDto.Paginate(c.GetPageSize(), c.GetPageIndex()), cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
actions.Permission(data.TableName(), p), actions.Permission(data.TableName(), p),
cDto.PassDel("ot"), cDto.PassDel("ot"),
cDto.SetWhere("ot", "club_id", c.ClubId),
). ).
Find(list).Limit(-1).Offset(-1). Find(list).Limit(-1).Offset(-1).
Count(count).Error Count(count).Error
......
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