From 63dc01da31d96ba7ba31e7bf10f23df6419acac3 Mon Sep 17 00:00:00 2001 From: haoyanbin <605649647@qq.com> Date: Thu, 27 Jan 2022 17:29:49 +0800 Subject: [PATCH] SetCreateBy --- app/operate/apis/org_ad.go | 11 +- app/operate/apis/org_club.go | 6 +- app/operate/apis/org_club_user.go | 126 ++++++++++---------- app/operate/apis/org_division.go | 6 +- app/operate/apis/org_league.go | 6 +- app/operate/apis/org_match.go | 8 +- app/operate/apis/org_match_evaluate.go | 2 +- app/operate/apis/org_match_team_player.go | 6 +- app/operate/apis/org_news.go | 6 +- app/operate/apis/org_player.go | 8 +- app/operate/apis/org_player_user.go | 126 ++++++++++---------- app/operate/apis/org_season.go | 6 +- app/operate/apis/org_team.go | 4 +- app/operate/apis/org_team_club.go | 2 +- app/operate/apis/org_team_match_evaluate.go | 2 +- app/operate/apis/org_team_user.go | 8 +- app/operate/apis/org_user.go | 4 +- 17 files changed, 170 insertions(+), 167 deletions(-) diff --git a/app/operate/apis/org_ad.go b/app/operate/apis/org_ad.go index 6383d32..fd40e27 100755 --- a/app/operate/apis/org_ad.go +++ b/app/operate/apis/org_ad.go @@ -46,6 +46,7 @@ func (e OrgAd) GetPage(c *gin.Context) { err = s.GetPage(&req, p, &list, &count) if err != nil { + e.Logger.Error(err) e.Error(109, err, "未获å–到数æ®") return } @@ -71,7 +72,7 @@ func (e OrgAd) Get(c *gin.Context) { Errors if err != nil { e.Logger.Error(err) - e.Error(500, err, err.Error()) + e.Error(109, err, "未获å–到数æ®") return } var object models.OrgAd @@ -79,6 +80,7 @@ func (e OrgAd) Get(c *gin.Context) { p := actions.GetPermissionFromContext(c) err = s.Get(&req, p, &object) if err != nil { + e.Logger.Error(err) e.Error(109, err, "未获å–到数æ®") return } @@ -110,10 +112,11 @@ func (e OrgAd) Insert(c *gin.Context) { return } // 设置创建人 - req.SetCreateBy(user.GetUserId(c)) + req.CreateBy = user.GetUserId(c) err = s.Insert(&req) if err != nil { + e.Logger.Error(err) e.Error(109, err, "未获å–到数æ®") return } @@ -144,11 +147,12 @@ func (e OrgAd) Update(c *gin.Context) { e.Error(500, err, err.Error()) return } - req.SetUpdateBy(user.GetUserId(c)) + req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) err = s.Update(&req, p) if err != nil { + e.Logger.Error(err) e.Error(109, err, "未获å–到数æ®") return } @@ -177,7 +181,6 @@ func (e OrgAd) Delete(c *gin.Context) { return } - // req.SetUpdateBy(user.GetUserId(c)) p := actions.GetPermissionFromContext(c) err = s.Remove(&req, p) diff --git a/app/operate/apis/org_club.go b/app/operate/apis/org_club.go index b581c88..7279a17 100755 --- a/app/operate/apis/org_club.go +++ b/app/operate/apis/org_club.go @@ -115,7 +115,7 @@ func (e OrgClub) Insert(c *gin.Context) { return } // 设置创建人 - req.SetCreateBy(user.GetUserId(c)) + req.CreateBy = user.GetUserId(c) err = s.Insert(&req) if err != nil { @@ -226,7 +226,7 @@ func (e OrgClub) Update(c *gin.Context) { e.Error(500, err, err.Error()) return } - req.SetUpdateBy(user.GetUserId(c)) + req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) err = s.Update(&req, p) @@ -282,7 +282,7 @@ func (e OrgClub) Delete(c *gin.Context) { return } - // req.SetUpdateBy(user.GetUserId(c)) + // req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) err = s.Remove(&req, p) diff --git a/app/operate/apis/org_club_user.go b/app/operate/apis/org_club_user.go index b210ae5..e3af30e 100755 --- a/app/operate/apis/org_club_user.go +++ b/app/operate/apis/org_club_user.go @@ -1,7 +1,7 @@ package apis import ( - "fmt" + "fmt" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/api" @@ -28,18 +28,18 @@ type OrgClubUser struct { // @Router /api/v1/org-club-user [get] // @Security Bearer func (e OrgClubUser) GetPage(c *gin.Context) { - req := dto.OrgClubUserGetPageReq{} - s := service.OrgClubUser{} - err := e.MakeContext(c). - MakeOrm(). - Bind(&req). - MakeService(&s.Service). - Errors - if err != nil { - e.Logger.Error(err) - e.Error(500, err, err.Error()) - return - } + req := dto.OrgClubUserGetPageReq{} + s := service.OrgClubUser{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } p := actions.GetPermissionFromContext(c) list := make([]models.OrgClubUser, 0) @@ -48,7 +48,7 @@ func (e OrgClubUser) GetPage(c *gin.Context) { err = s.GetPage(&req, p, &list, &count) if err != nil { e.Error(500, err, fmt.Sprintf("获å–俱ä¹éƒ¨è´¦æˆ·ä¿¡æ¯ 失败,\r\nå¤±è´¥ä¿¡æ¯ %s", err.Error())) - return + return } e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询æˆåŠŸ") @@ -65,7 +65,7 @@ func (e OrgClubUser) GetPage(c *gin.Context) { func (e OrgClubUser) Get(c *gin.Context) { req := dto.OrgClubUserGetReq{} s := service.OrgClubUser{} - err := e.MakeContext(c). + err := e.MakeContext(c). MakeOrm(). Bind(&req). MakeService(&s.Service). @@ -81,10 +81,10 @@ func (e OrgClubUser) Get(c *gin.Context) { err = s.Get(&req, p, &object) if err != nil { e.Error(500, err, fmt.Sprintf("获å–俱ä¹éƒ¨è´¦æˆ·ä¿¡æ¯å¤±è´¥ï¼Œ\r\nå¤±è´¥ä¿¡æ¯ %s", err.Error())) - return + return } - e.OK( object, "查询æˆåŠŸ") + e.OK(object, "查询æˆåŠŸ") } // Insert 创建俱ä¹éƒ¨è´¦æˆ·ä¿¡æ¯ @@ -98,25 +98,25 @@ func (e OrgClubUser) Get(c *gin.Context) { // @Router /api/v1/org-club-user [post] // @Security Bearer func (e OrgClubUser) Insert(c *gin.Context) { - req := dto.OrgClubUserInsertReq{} - s := service.OrgClubUser{} - err := e.MakeContext(c). - MakeOrm(). - Bind(&req). - MakeService(&s.Service). - Errors - if err != nil { - e.Logger.Error(err) - e.Error(500, err, err.Error()) - return - } + req := dto.OrgClubUserInsertReq{} + s := service.OrgClubUser{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } // 设置创建人 - req.SetCreateBy(user.GetUserId(c)) + req.CreateBy = user.GetUserId(c) err = s.Insert(&req) if err != nil { e.Error(500, err, fmt.Sprintf("创建俱ä¹éƒ¨è´¦æˆ·ä¿¡æ¯ 失败,\r\nå¤±è´¥ä¿¡æ¯ %s", err.Error())) - return + return } e.OK(req.GetId(), "创建æˆåŠŸ") @@ -133,27 +133,27 @@ func (e OrgClubUser) Insert(c *gin.Context) { // @Router /api/v1/org-club-user/{id} [put] // @Security Bearer func (e OrgClubUser) Update(c *gin.Context) { - req := dto.OrgClubUserUpdateReq{} - s := service.OrgClubUser{} - err := e.MakeContext(c). - MakeOrm(). - Bind(&req). - MakeService(&s.Service). - Errors - if err != nil { - e.Logger.Error(err) - e.Error(500, err, err.Error()) - return - } - req.SetUpdateBy(user.GetUserId(c)) + req := dto.OrgClubUserUpdateReq{} + s := service.OrgClubUser{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) err = s.Update(&req, p) if err != nil { e.Error(500, err, fmt.Sprintf("修改俱ä¹éƒ¨è´¦æˆ·ä¿¡æ¯ 失败,\r\nå¤±è´¥ä¿¡æ¯ %s", err.Error())) - return + return } - e.OK( req.GetId(), "修改æˆåŠŸ") + e.OK(req.GetId(), "修改æˆåŠŸ") } // Delete åˆ é™¤ä¿±ä¹éƒ¨è´¦æˆ·ä¿¡æ¯ @@ -165,26 +165,26 @@ func (e OrgClubUser) Update(c *gin.Context) { // @Router /api/v1/org-club-user [delete] // @Security Bearer func (e OrgClubUser) Delete(c *gin.Context) { - s := service.OrgClubUser{} - req := dto.OrgClubUserDeleteReq{} - err := e.MakeContext(c). - MakeOrm(). - Bind(&req). - MakeService(&s.Service). - Errors - if err != nil { - e.Logger.Error(err) - e.Error(500, err, err.Error()) - return - } - - // req.SetUpdateBy(user.GetUserId(c)) + s := service.OrgClubUser{} + req := dto.OrgClubUserDeleteReq{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + // req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) err = s.Remove(&req, p) if err != nil { e.Error(500, err, fmt.Sprintf("åˆ é™¤ä¿±ä¹éƒ¨è´¦æˆ·ä¿¡æ¯å¤±è´¥ï¼Œ\r\nå¤±è´¥ä¿¡æ¯ %s", err.Error())) - return + return } - e.OK( req.GetId(), "åˆ é™¤æˆåŠŸ") -} \ No newline at end of file + e.OK(req.GetId(), "åˆ é™¤æˆåŠŸ") +} diff --git a/app/operate/apis/org_division.go b/app/operate/apis/org_division.go index fb3f1ad..17f70e2 100755 --- a/app/operate/apis/org_division.go +++ b/app/operate/apis/org_division.go @@ -112,7 +112,7 @@ func (e OrgDivision) Insert(c *gin.Context) { return } // 设置创建人 - req.SetCreateBy(user.GetUserId(c)) + req.CreateBy = user.GetUserId(c) err = s.Insert(&req) if err != nil { @@ -146,7 +146,7 @@ func (e OrgDivision) Update(c *gin.Context) { e.Error(500, err, err.Error()) return } - req.SetUpdateBy(user.GetUserId(c)) + req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) err = s.Update(&req, p) @@ -179,7 +179,7 @@ func (e OrgDivision) Delete(c *gin.Context) { return } - // req.SetUpdateBy(user.GetUserId(c)) + // req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) err = s.Remove(&req, p) diff --git a/app/operate/apis/org_league.go b/app/operate/apis/org_league.go index 323a773..5c28c38 100755 --- a/app/operate/apis/org_league.go +++ b/app/operate/apis/org_league.go @@ -112,7 +112,7 @@ func (e OrgLeague) Insert(c *gin.Context) { return } // 设置创建人 - req.SetCreateBy(user.GetUserId(c)) + req.CreateBy = user.GetUserId(c) err = s.Insert(&req) if err != nil { @@ -146,7 +146,7 @@ func (e OrgLeague) Update(c *gin.Context) { e.Error(500, err, err.Error()) return } - req.SetUpdateBy(user.GetUserId(c)) + req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) err = s.Update(&req, p) @@ -179,7 +179,7 @@ func (e OrgLeague) Delete(c *gin.Context) { return } - // req.SetUpdateBy(user.GetUserId(c)) + // req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) err = s.Remove(&req, p) diff --git a/app/operate/apis/org_match.go b/app/operate/apis/org_match.go index 0a31150..ec4e1f9 100755 --- a/app/operate/apis/org_match.go +++ b/app/operate/apis/org_match.go @@ -258,7 +258,7 @@ func (e OrgMatch) Insert(c *gin.Context) { return } // 设置创建人 - req.SetCreateBy(user.GetUserId(c)) + req.CreateBy = user.GetUserId(c) err = s.Insert(&req) if err != nil { @@ -292,7 +292,7 @@ func (e OrgMatch) Update(c *gin.Context) { e.Error(500, err, err.Error()) return } - req.SetUpdateBy(user.GetUserId(c)) + req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) err = s.Update(&req, p) @@ -325,7 +325,7 @@ func (e OrgMatch) Delete(c *gin.Context) { return } - // req.SetUpdateBy(user.GetUserId(c)) + // req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) err = s.Remove(&req, p) @@ -550,7 +550,7 @@ func (e OrgMatch) UpdatePlayerData(c *gin.Context) { e.Error(500, err, err.Error()) return } - req.SetUpdateBy(user.GetUserId(c)) + req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) err = s.Update(&req, p) diff --git a/app/operate/apis/org_match_evaluate.go b/app/operate/apis/org_match_evaluate.go index cb742af..623caf4 100755 --- a/app/operate/apis/org_match_evaluate.go +++ b/app/operate/apis/org_match_evaluate.go @@ -193,7 +193,7 @@ func (e OrgMatchEvaluate) Update(c *gin.Context) { e.Error(500, err, err.Error()) return } - req.SetUpdateBy(user.GetUserId(c)) + req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) err, playerId := s.IsBeing(req.MatchId, req.Rounds, req.PlayerId) diff --git a/app/operate/apis/org_match_team_player.go b/app/operate/apis/org_match_team_player.go index 3abce82..764f857 100755 --- a/app/operate/apis/org_match_team_player.go +++ b/app/operate/apis/org_match_team_player.go @@ -112,7 +112,7 @@ func (e OrgMatchTeamPlayer) Insert(c *gin.Context) { return } // 设置创建人 - req.SetCreateBy(user.GetUserId(c)) + req.CreateBy = user.GetUserId(c) err = s.Insert(&req) if err != nil { @@ -146,7 +146,7 @@ func (e OrgMatchTeamPlayer) Update(c *gin.Context) { e.Error(500, err, err.Error()) return } - req.SetUpdateBy(user.GetUserId(c)) + req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) err = s.Update(&req, p) @@ -179,7 +179,7 @@ func (e OrgMatchTeamPlayer) Delete(c *gin.Context) { return } - // req.SetUpdateBy(user.GetUserId(c)) + // req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) err = s.Remove(&req, p) diff --git a/app/operate/apis/org_news.go b/app/operate/apis/org_news.go index 00fad4b..98047f7 100755 --- a/app/operate/apis/org_news.go +++ b/app/operate/apis/org_news.go @@ -112,7 +112,7 @@ func (e OrgNews) Insert(c *gin.Context) { return } // 设置创建人 - req.SetCreateBy(user.GetUserId(c)) + req.CreateBy = user.GetUserId(c) err = s.Insert(&req) if err != nil { @@ -146,7 +146,7 @@ func (e OrgNews) Update(c *gin.Context) { e.Error(500, err, err.Error()) return } - req.SetUpdateBy(user.GetUserId(c)) + req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) err = s.Update(&req, p) @@ -179,7 +179,7 @@ func (e OrgNews) Delete(c *gin.Context) { return } - // req.SetUpdateBy(user.GetUserId(c)) + // req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) err = s.Remove(&req, p) diff --git a/app/operate/apis/org_player.go b/app/operate/apis/org_player.go index 2f64aa0..5734a2e 100755 --- a/app/operate/apis/org_player.go +++ b/app/operate/apis/org_player.go @@ -137,7 +137,7 @@ func (e OrgPlayer) Insert(c *gin.Context) { } // 设置创建人 - req.SetCreateBy(user.GetUserId(c)) + req.CreateBy = user.GetUserId(c) err = s.Insert(&req) if err != nil { @@ -171,7 +171,7 @@ func (e OrgPlayer) Update(c *gin.Context) { e.Error(500, err, err.Error()) return } - req.SetUpdateBy(user.GetUserId(c)) + req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) reqUser := dto.OrgPlayerUserInsertReq{} @@ -220,7 +220,7 @@ func (e OrgPlayer) Delete(c *gin.Context) { return } - // req.SetUpdateBy(user.GetUserId(c)) + // req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) err = s.Remove(&req, p) @@ -254,7 +254,7 @@ func (e OrgPlayer) UpdateStatus(c *gin.Context) { e.Error(500, err, err.Error()) return } - req.SetUpdateBy(user.GetUserId(c)) + req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) reqUpdate := dto.OrgPlayerUpdateReq{} diff --git a/app/operate/apis/org_player_user.go b/app/operate/apis/org_player_user.go index 7a89817..f7e9531 100755 --- a/app/operate/apis/org_player_user.go +++ b/app/operate/apis/org_player_user.go @@ -1,7 +1,7 @@ package apis import ( - "fmt" + "fmt" "github.com/gin-gonic/gin" "github.com/go-admin-team/go-admin-core/sdk/api" @@ -28,18 +28,18 @@ type OrgPlayerUser struct { // @Router /api/v1/org-player-user [get] // @Security Bearer func (e OrgPlayerUser) GetPage(c *gin.Context) { - req := dto.OrgPlayerUserGetPageReq{} - s := service.OrgPlayerUser{} - err := e.MakeContext(c). - MakeOrm(). - Bind(&req). - MakeService(&s.Service). - Errors - if err != nil { - e.Logger.Error(err) - e.Error(500, err, err.Error()) - return - } + req := dto.OrgPlayerUserGetPageReq{} + s := service.OrgPlayerUser{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } p := actions.GetPermissionFromContext(c) list := make([]models.OrgPlayerUser, 0) @@ -48,7 +48,7 @@ func (e OrgPlayerUser) GetPage(c *gin.Context) { err = s.GetPage(&req, p, &list, &count) if err != nil { e.Error(500, err, fmt.Sprintf("获å–çƒå‘˜è´¦æˆ·ä¿¡æ¯ 失败,\r\nå¤±è´¥ä¿¡æ¯ %s", err.Error())) - return + return } e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询æˆåŠŸ") @@ -65,7 +65,7 @@ func (e OrgPlayerUser) GetPage(c *gin.Context) { func (e OrgPlayerUser) Get(c *gin.Context) { req := dto.OrgPlayerUserGetReq{} s := service.OrgPlayerUser{} - err := e.MakeContext(c). + err := e.MakeContext(c). MakeOrm(). Bind(&req). MakeService(&s.Service). @@ -81,10 +81,10 @@ func (e OrgPlayerUser) Get(c *gin.Context) { err = s.Get(&req, p, &object) if err != nil { e.Error(500, err, fmt.Sprintf("获å–çƒå‘˜è´¦æˆ·ä¿¡æ¯å¤±è´¥ï¼Œ\r\nå¤±è´¥ä¿¡æ¯ %s", err.Error())) - return + return } - e.OK( object, "查询æˆåŠŸ") + e.OK(object, "查询æˆåŠŸ") } // Insert 创建çƒå‘˜è´¦æˆ·ä¿¡æ¯ @@ -98,25 +98,25 @@ func (e OrgPlayerUser) Get(c *gin.Context) { // @Router /api/v1/org-player-user [post] // @Security Bearer func (e OrgPlayerUser) Insert(c *gin.Context) { - req := dto.OrgPlayerUserInsertReq{} - s := service.OrgPlayerUser{} - err := e.MakeContext(c). - MakeOrm(). - Bind(&req). - MakeService(&s.Service). - Errors - if err != nil { - e.Logger.Error(err) - e.Error(500, err, err.Error()) - return - } + req := dto.OrgPlayerUserInsertReq{} + s := service.OrgPlayerUser{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } // 设置创建人 - req.SetCreateBy(user.GetUserId(c)) + req.CreateBy = user.GetUserId(c) err = s.Insert(&req) if err != nil { e.Error(500, err, fmt.Sprintf("创建çƒå‘˜è´¦æˆ·ä¿¡æ¯ 失败,\r\nå¤±è´¥ä¿¡æ¯ %s", err.Error())) - return + return } e.OK(req.GetId(), "创建æˆåŠŸ") @@ -133,27 +133,27 @@ func (e OrgPlayerUser) Insert(c *gin.Context) { // @Router /api/v1/org-player-user/{id} [put] // @Security Bearer func (e OrgPlayerUser) Update(c *gin.Context) { - req := dto.OrgPlayerUserUpdateReq{} - s := service.OrgPlayerUser{} - err := e.MakeContext(c). - MakeOrm(). - Bind(&req). - MakeService(&s.Service). - Errors - if err != nil { - e.Logger.Error(err) - e.Error(500, err, err.Error()) - return - } - req.SetUpdateBy(user.GetUserId(c)) + req := dto.OrgPlayerUserUpdateReq{} + s := service.OrgPlayerUser{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) err = s.Update(&req, p) if err != nil { e.Error(500, err, fmt.Sprintf("修改çƒå‘˜è´¦æˆ·ä¿¡æ¯ 失败,\r\nå¤±è´¥ä¿¡æ¯ %s", err.Error())) - return + return } - e.OK( req.GetId(), "修改æˆåŠŸ") + e.OK(req.GetId(), "修改æˆåŠŸ") } // Delete åˆ é™¤çƒå‘˜è´¦æˆ·ä¿¡æ¯ @@ -165,26 +165,26 @@ func (e OrgPlayerUser) Update(c *gin.Context) { // @Router /api/v1/org-player-user [delete] // @Security Bearer func (e OrgPlayerUser) Delete(c *gin.Context) { - s := service.OrgPlayerUser{} - req := dto.OrgPlayerUserDeleteReq{} - err := e.MakeContext(c). - MakeOrm(). - Bind(&req). - MakeService(&s.Service). - Errors - if err != nil { - e.Logger.Error(err) - e.Error(500, err, err.Error()) - return - } - - // req.SetUpdateBy(user.GetUserId(c)) + s := service.OrgPlayerUser{} + req := dto.OrgPlayerUserDeleteReq{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + // req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) err = s.Remove(&req, p) if err != nil { e.Error(500, err, fmt.Sprintf("åˆ é™¤çƒå‘˜è´¦æˆ·ä¿¡æ¯å¤±è´¥ï¼Œ\r\nå¤±è´¥ä¿¡æ¯ %s", err.Error())) - return + return } - e.OK( req.GetId(), "åˆ é™¤æˆåŠŸ") -} \ No newline at end of file + e.OK(req.GetId(), "åˆ é™¤æˆåŠŸ") +} diff --git a/app/operate/apis/org_season.go b/app/operate/apis/org_season.go index 3e78955..96e6568 100755 --- a/app/operate/apis/org_season.go +++ b/app/operate/apis/org_season.go @@ -127,7 +127,7 @@ func (e OrgSeason) Insert(c *gin.Context) { return } // 设置创建人 - req.SetCreateBy(user.GetUserId(c)) + req.CreateBy = user.GetUserId(c) err = s.Insert(&req) if err != nil { @@ -161,7 +161,7 @@ func (e OrgSeason) Update(c *gin.Context) { e.Error(500, err, err.Error()) return } - req.SetUpdateBy(user.GetUserId(c)) + req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) err = s.Update(&req, p) @@ -194,7 +194,7 @@ func (e OrgSeason) Delete(c *gin.Context) { return } - // req.SetUpdateBy(user.GetUserId(c)) + // req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) err = s.Remove(&req, p) diff --git a/app/operate/apis/org_team.go b/app/operate/apis/org_team.go index 3f5765f..4cd7906 100755 --- a/app/operate/apis/org_team.go +++ b/app/operate/apis/org_team.go @@ -198,7 +198,7 @@ func (e OrgTeam) Update(c *gin.Context) { e.Error(500, err, err.Error()) return } - req.SetUpdateBy(user.GetUserId(c)) + req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) err = s.Update(&req, p) @@ -231,7 +231,7 @@ func (e OrgTeam) Delete(c *gin.Context) { return } - // req.SetUpdateBy(user.GetUserId(c)) + // req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) err = s.Remove(&req, p) diff --git a/app/operate/apis/org_team_club.go b/app/operate/apis/org_team_club.go index a333fab..ba41c5c 100755 --- a/app/operate/apis/org_team_club.go +++ b/app/operate/apis/org_team_club.go @@ -84,7 +84,7 @@ func (e OrgTeamClub) Update(c *gin.Context) { e.Error(500, err, err.Error()) return } - req.SetUpdateBy(user.GetUserId(c)) + req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) err = s.Update(&req, p) diff --git a/app/operate/apis/org_team_match_evaluate.go b/app/operate/apis/org_team_match_evaluate.go index 0eccbc8..49e1783 100755 --- a/app/operate/apis/org_team_match_evaluate.go +++ b/app/operate/apis/org_team_match_evaluate.go @@ -186,7 +186,7 @@ func (e OrgTeamMatchEvaluate) Update(c *gin.Context) { e.Error(500, err, err.Error()) return } - req.SetUpdateBy(user.GetUserId(c)) + req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) if req.MatchId == "" || req.Rounds == "" || req.PlayerId == "" { diff --git a/app/operate/apis/org_team_user.go b/app/operate/apis/org_team_user.go index 63fbc50..8919ce5 100755 --- a/app/operate/apis/org_team_user.go +++ b/app/operate/apis/org_team_user.go @@ -142,7 +142,7 @@ func (e OrgTeamUser) Insert(c *gin.Context) { } // 设置创建人 - req.SetCreateBy(user.GetUserId(c)) + req.CreateBy = user.GetUserId(c) req.UserId = strconv.Itoa(reqSysUser.GetId().(int)) err = s.Insert(&req) if err != nil { @@ -176,7 +176,7 @@ func (e OrgTeamUser) Update(c *gin.Context) { e.Error(500, err, err.Error()) return } - req.SetUpdateBy(user.GetUserId(c)) + req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) err = s.Update(&req, p) @@ -229,7 +229,7 @@ func (e OrgTeamUser) UpdateStatus(c *gin.Context) { e.Error(500, err, err.Error()) return } - req.SetUpdateBy(user.GetUserId(c)) + req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) err, userId := s.GetUserId(req.Id) @@ -278,7 +278,7 @@ func (e OrgTeamUser) Delete(c *gin.Context) { return } - // req.SetUpdateBy(user.GetUserId(c)) + // req.UpdateBy = user.GetUserId(c) p := actions.GetPermissionFromContext(c) _, userIds := s.GetUserIds(req.Ids) diff --git a/app/operate/apis/org_user.go b/app/operate/apis/org_user.go index 92f31ad..b42f04e 100755 --- a/app/operate/apis/org_user.go +++ b/app/operate/apis/org_user.go @@ -175,7 +175,7 @@ func (e OrgUser) Update(c *gin.Context) { return } - req.SetUpdateBy(user.GetUserId(c)) + req.UpdateBy = user.GetUserId(c) //æ•°æ®æƒé™æ£€æŸ¥ p := actions.GetPermissionFromContext(c) @@ -288,7 +288,7 @@ func (e OrgUser) ResetPwd(c *gin.Context) { return } - req.SetUpdateBy(user.GetUserId(c)) + req.UpdateBy = user.GetUserId(c) //æ•°æ®æƒé™æ£€æŸ¥ p := actions.GetPermissionFromContext(c) -- 2.18.1