1

app/operate/service/dto/org_league.go

@@ -8,19 +8,19 @@ import (
 )
 
 type OrgLeagueGetPageReq struct {
-	dto.Pagination     `search:"-"`
-    OrgLeagueOrder
+	dto.Pagination `search:"-"`
+	OrgLeagueOrder
 }
 
-type OrgLeagueOrder struct {Id int `form:"idOrder"  search:"type:order;column:id;table:org_league"`
-    LeagueName string `form:"leagueNameOrder"  search:"type:order;column:league_name;table:org_league"`
-    Status string `form:"statusOrder"  search:"type:order;column:status;table:org_league"`
-    CreateBy string `form:"createByOrder"  search:"type:order;column:create_by;table:org_league"`
-    UpdateBy string `form:"updateByOrder"  search:"type:order;column:update_by;table:org_league"`
-    CreatedAt time.Time `form:"createdAtOrder"  search:"type:order;column:created_at;table:org_league"`
-    UpdatedAt time.Time `form:"updatedAtOrder"  search:"type:order;column:updated_at;table:org_league"`
-    DeletedAt time.Time `form:"deletedAtOrder"  search:"type:order;column:deleted_at;table:org_league"`
-    
+type OrgLeagueOrder struct {
+	Id         int       `form:"idOrder"  search:"type:order;column:id;table:org_league"`
+	LeagueName string    `form:"leagueNameOrder"  search:"type:order;column:league_name;table:org_league"`
+	Status     string    `form:"statusOrder"  search:"type:order;column:status;table:org_league"`
+	CreateBy   string    `form:"createByOrder"  search:"type:order;column:create_by;table:org_league"`
+	UpdateBy   string    `form:"updateByOrder"  search:"type:order;column:update_by;table:org_league"`
+	CreatedAt  time.Time `form:"createdAtOrder"  search:"type:order;column:created_at;table:org_league"`
+	UpdatedAt  time.Time `form:"updatedAtOrder"  search:"type:order;column:updated_at;table:org_league"`
+	DeletedAt  time.Time `form:"deletedAtOrder"  search:"type:order;column:deleted_at;table:org_league"`
 }
 
 func (m *OrgLeagueGetPageReq) GetNeedSearch() interface{} {
@@ -28,18 +28,18 @@ func (m *OrgLeagueGetPageReq) GetNeedSearch() interface{} {
 }
 
 type OrgLeagueInsertReq struct {
-    Id int `json:"-" comment:""` // 
-    LeagueName string `json:"leagueName" comment:"联赛级别"`
-    Status string `json:"status" comment:"联赛开启状态 1 是 0 否"`
-    common.ControlBy
+	Id         int    `json:"-" comment:""` //
+	LeagueName string `json:"leagueName" comment:"联赛级别"`
+	Status     string `json:"status" comment:"联赛开启状态 1 是 0 否"`
+	common.ControlBy
 }
 
-func (s *OrgLeagueInsertReq) Generate(model *models.OrgLeague)  {
-    if s.Id == 0 {
-        model.Model = common.Model{ Id: s.Id }
-    }
-    model.LeagueName = s.LeagueName
-    model.Status = s.Status
+func (s *OrgLeagueInsertReq) Generate(model *models.OrgLeague) {
+	if s.Id == 0 {
+		model.Model = common.Model{Id: s.Id}
+	}
+	model.LeagueName = s.LeagueName
+	model.Status = s.Status
 }
 
 func (s *OrgLeagueInsertReq) GetId() interface{} {
@@ -47,18 +47,18 @@ func (s *OrgLeagueInsertReq) GetId() interface{} {
 }
 
 type OrgLeagueUpdateReq struct {
-    Id int `uri:"id" comment:""` // 
-    LeagueName string `json:"leagueName" comment:"联赛级别"`
-    Status string `json:"status" comment:"联赛开启状态 1 是 0 否"`
-    common.ControlBy
+	Id         int    `uri:"id" comment:""` //
+	LeagueName string `json:"leagueName" comment:"联赛级别"`
+	Status     string `json:"status" comment:"联赛开启状态 1 是 0 否"`
+	common.ControlBy
 }
 
-func (s *OrgLeagueUpdateReq) Generate(model *models.OrgLeague)  {
-    if s.Id == 0 {
-        model.Model = common.Model{ Id: s.Id }
-    }
-    model.LeagueName = s.LeagueName
-    model.Status = s.Status
+func (s *OrgLeagueUpdateReq) Generate(model *models.OrgLeague) {
+	if s.Id == 0 {
+		model.Model = common.Model{Id: s.Id}
+	}
+	model.LeagueName = s.LeagueName
+	model.Status = s.Status
 }
 
 func (s *OrgLeagueUpdateReq) GetId() interface{} {
@@ -67,8 +67,9 @@ func (s *OrgLeagueUpdateReq) GetId() interface{} {
 
 // OrgLeagueGetReq 功能获取请求参数
 type OrgLeagueGetReq struct {
-     Id int `uri:"id"`
+	Id int `uri:"id"`
 }
+
 func (s *OrgLeagueGetReq) GetId() interface{} {
 	return s.Id
 }
@@ -80,4 +81,4 @@ type OrgLeagueDeleteReq struct {
 
 func (s *OrgLeagueDeleteReq) GetId() interface{} {
 	return s.Ids
-}
\ No newline at end of file
+}

app/operate/service/dto/org_team.go

@@ -12,6 +12,7 @@ type OrgTeamGetPageReq struct {
 	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:"开始时间"`             //开始时间
 	CreateEndTime   string `form:"createEndTime"  search:"type:lte;column:created_at;table:ot" comment:"结束时间"`               //结束时间
+	OrgTeamOrder
 }
 
 type OrgTeamGetPageReply struct {

app/operate/service/org_club.go

@@ -27,6 +27,7 @@ func (e *OrgClub) GetPage(c *dto.OrgClubGetPageReq, p *actions.DataPermission, l
 			cDto.MakeCondition(c.GetNeedSearch()),
 			cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
 			actions.Permission(data.TableName(), p),
+			cDto.PassDel("org_club"),
 		).
 		Find(list).Limit(-1).Offset(-1).
 		Count(count).Error

app/operate/service/org_club_player.go

@@ -32,6 +32,7 @@ func (e *OrgClubPlayer) GetPage(c *dto.OrgClubPlayerGetPageReq, p *actions.DataP
 			cDto.MakeCondition(c.GetNeedSearch()),
 			cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
 			actions.Permission("omtp", p),
+			cDto.PassDel("omtp"),
 		).
 		Find(list).Limit(-1).Offset(-1).
 		Count(count).Error
@@ -57,6 +58,7 @@ func (e *OrgClubPlayer) GetMatchInfo(id string, p *actions.DataPermission, data
 		Joins("left join org_season as os on os.id = om.season_id").
 		Scopes(
 			actions.Permission("omtp", p),
+			cDto.PassDel("omtp"),
 		).
 		First(data, id).Error
 	if err != nil {
@@ -79,6 +81,7 @@ func (e *OrgClubPlayer) GetRoundsScoring(playerId string, rounds string, teamPla
 			cDto.SetWhere("omtp", "player_id", playerId),
 			cDto.SetWhere("omtp", "rounds", rounds),
 			cDto.SetWhere("omtp", "id", teamPlayerId),
+			//cDto.PassDel("omtp"),
 		).
 		Find(data).Error
 	if err != nil {

app/operate/service/org_club_team.go

@@ -35,6 +35,7 @@ func (e *OrgClubTeam) GetPage(c *dto.OrgClubTeamGetPageReq, p *actions.DataPermi
 			cDto.MakeCondition(c.GetNeedSearch()),
 			cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
 			actions.Permission(data.TableName(), p),
+			cDto.PassDel("ompt"),
 		).
 		Group("omtp.team_id").
 		Find(list).Limit(-1).Offset(-1).

app/operate/service/org_match.go

@@ -34,6 +34,7 @@ func (e *OrgMatch) GetPage(c *dto.OrgMatchGetPageReq, p *actions.DataPermission,
 			cDto.MakeCondition(c.GetNeedSearch()),
 			cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
 			actions.Permission(data.TableName(), p),
+			cDto.PassDel("om"),
 		).
 		Find(list).Limit(-1).Offset(-1).
 		Count(count).Error
@@ -61,6 +62,7 @@ func (e *OrgMatch) GetPageForTeam(c *dto.OrgMatchGetPageReq, p *actions.DataPerm
 		Scopes(
 			cDto.MakeCondition(c.GetNeedSearch()),
 			cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
+			cDto.PassDel("om"),
 			actions.Permission(data.TableName(), p),
 		).
 		Find(list).Limit(-1).Offset(-1).

app/operate/service/org_team.go

@@ -28,6 +28,7 @@ func (e *OrgTeam) GetPage(c *dto.OrgTeamGetPageReq, p *actions.DataPermission, l
 			cDto.MakeCondition(c.GetNeedSearch()),
 			cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
 			actions.Permission(data.TableName(), p),
+			cDto.PassDel("ot"),
 		).
 		Find(list).Limit(-1).Offset(-1).
 		Count(count).Error

common/dto/search.go

@@ -82,3 +82,9 @@ func Paginate(pageSize, pageIndex int) func(db *gorm.DB) *gorm.DB {
 		return db.Offset(offset).Limit(pageSize)
 	}
 }
+
+func PassDel(tableName string) func(db *gorm.DB) *gorm.DB {
+	return func(db *gorm.DB) *gorm.DB {
+		return db.Where(tableName + ".deleted_at is null")
+	}
+}