Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
nbya
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
haoyanbin
nbya
Commits
c14432ef
Commit
c14432ef
authored
Jan 17, 2022
by
haoyanbin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update
parent
6eb1de23
Changes
20
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
240 additions
and
120 deletions
+240
-120
sys_user.go
app/admin/service/dto/sys_user.go
+2
-2
org_player.go
app/operate/apis/org_player.go
+38
-0
org_team_user.go
app/operate/apis/org_team_user.go
+52
-2
org_player.go
app/operate/models/org_player.go
+1
-0
org_player.go
app/operate/router/org_player.go
+2
-1
org_player_user.go
app/operate/router/org_player_user.go
+1
-1
org_team_user.go
app/operate/router/org_team_user.go
+2
-1
org_match.go
app/operate/service/dto/org_match.go
+2
-2
org_player.go
app/operate/service/dto/org_player.go
+8
-1
org_team_user.go
app/operate/service/dto/org_team_user.go
+7
-0
org_ad.go
app/operate/service/org_ad.go
+26
-26
org_club_user.go
app/operate/service/org_club_user.go
+1
-1
org_division.go
app/operate/service/org_division.go
+26
-26
org_league.go
app/operate/service/org_league.go
+26
-26
org_match.go
app/operate/service/org_match.go
+1
-1
org_news.go
app/operate/service/org_news.go
+26
-26
org_player.go
app/operate/service/org_player.go
+1
-1
org_player_user.go
app/operate/service/org_player_user.go
+1
-1
org_season.go
app/operate/service/org_season.go
+1
-1
org_team_user.go
app/operate/service/org_team_user.go
+16
-1
No files found.
app/admin/service/dto/sys_user.go
View file @
c14432ef
...
@@ -102,7 +102,7 @@ type SysUserInsertReq struct {
...
@@ -102,7 +102,7 @@ type SysUserInsertReq struct {
DeptId
int
`json:"deptId" comment:"部门" vd:"$>0"`
DeptId
int
`json:"deptId" comment:"部门" vd:"$>0"`
PostId
int
`json:"postId" comment:"岗位"`
PostId
int
`json:"postId" comment:"岗位"`
Remark
string
`json:"remark" comment:"备注"`
Remark
string
`json:"remark" comment:"备注"`
Status
string
`json:"status" comment:"状态" vd:"len($)>0" default:"
1
"`
Status
string
`json:"status" comment:"状态" vd:"len($)>0" default:"
2
"`
common
.
ControlBy
common
.
ControlBy
}
}
...
@@ -141,7 +141,7 @@ type SysUserUpdateReq struct {
...
@@ -141,7 +141,7 @@ type SysUserUpdateReq struct {
DeptId
int
`json:"deptId" comment:"部门" vd:"$>0"`
DeptId
int
`json:"deptId" comment:"部门" vd:"$>0"`
PostId
int
`json:"postId" comment:"岗位"`
PostId
int
`json:"postId" comment:"岗位"`
Remark
string
`json:"remark" comment:"备注"`
Remark
string
`json:"remark" comment:"备注"`
Status
string
`json:"status" comment:"状态" default:"
1
"`
Status
string
`json:"status" comment:"状态" default:"
2
"`
common
.
ControlBy
common
.
ControlBy
}
}
...
...
app/operate/apis/org_player.go
View file @
c14432ef
...
@@ -220,3 +220,41 @@ func (e OrgPlayer) Delete(c *gin.Context) {
...
@@ -220,3 +220,41 @@ func (e OrgPlayer) Delete(c *gin.Context) {
}
}
e
.
OK
(
req
.
GetId
(),
"删除成功"
)
e
.
OK
(
req
.
GetId
(),
"删除成功"
)
}
}
// Update <球队>修改球员状态
// @Summary <球队>修改球员状态
// @Description <球队>修改球员状态
// @Tags <球队>工作人员
// @Accept application/json
// @Product application/json
// @Param data body dto.OrgTeamUserUpdateReq true "body"
// @Success 200 {string} string "{"code": 200, "message": "修改成功"}"
// @Router /api/v1/org-player/update-status [put]
// @Security Bearer
func
(
e
OrgPlayer
)
UpdateStatus
(
c
*
gin
.
Context
)
{
req
:=
dto
.
OrgPlayerUpdateStatusReq
{}
s
:=
service
.
OrgPlayer
{}
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
))
p
:=
actions
.
GetPermissionFromContext
(
c
)
reqUpdate
:=
dto
.
OrgPlayerUpdateReq
{}
reqUpdate
.
Id
=
req
.
Id
reqUpdate
.
Status
=
req
.
Status
err
=
s
.
Update
(
&
reqUpdate
,
p
)
if
err
!=
nil
{
e
.
Error
(
500
,
err
,
fmt
.
Sprintf
(
"修改球队人员账户信息 失败,
\r\n
失败信息 %s"
,
err
.
Error
()))
return
}
e
.
OK
(
req
.
Id
,
"修改成功"
)
}
app/operate/apis/org_team_user.go
View file @
c14432ef
...
@@ -193,7 +193,7 @@ func (e OrgTeamUser) Update(c *gin.Context) {
...
@@ -193,7 +193,7 @@ func (e OrgTeamUser) Update(c *gin.Context) {
reqSysUser
.
UserId
,
_
=
strconv
.
Atoi
(
req
.
UserId
)
reqSysUser
.
UserId
,
_
=
strconv
.
Atoi
(
req
.
UserId
)
// 设置创建人
// 设置创建人
reqSysUser
.
Set
Cre
ateBy
(
user
.
GetUserId
(
c
))
reqSysUser
.
Set
Upd
ateBy
(
user
.
GetUserId
(
c
))
err
=
sSysUser
.
Update
(
&
reqSysUser
,
p
)
err
=
sSysUser
.
Update
(
&
reqSysUser
,
p
)
if
err
!=
nil
{
if
err
!=
nil
{
e
.
Logger
.
Error
(
err
)
e
.
Logger
.
Error
(
err
)
...
@@ -204,6 +204,56 @@ func (e OrgTeamUser) Update(c *gin.Context) {
...
@@ -204,6 +204,56 @@ func (e OrgTeamUser) Update(c *gin.Context) {
e
.
OK
(
req
.
GetId
(),
"修改成功"
)
e
.
OK
(
req
.
GetId
(),
"修改成功"
)
}
}
// Update <球队>修改工作人员
// @Summary <球队>修改工作人员
// @Description <球队>修改工作人员
// @Tags <球队>工作人员
// @Accept application/json
// @Product application/json
// @Param data body dto.OrgTeamUserUpdateReq true "body"
// @Success 200 {string} string "{"code": 200, "message": "修改成功"}"
// @Router /api/v1/org-team-user/update-status [put]
// @Security Bearer
func
(
e
OrgTeamUser
)
UpdateStatus
(
c
*
gin
.
Context
)
{
req
:=
dto
.
OrgTeamUserUpdateStatusReq
{}
s
:=
service
.
OrgTeamUser
{}
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
))
p
:=
actions
.
GetPermissionFromContext
(
c
)
err
,
userId
:=
s
.
GetUserId
(
req
.
Id
)
if
err
!=
nil
{
e
.
Error
(
500
,
err
,
fmt
.
Sprintf
(
"修改球队人员账户信息 失败,
\r\n
失败信息 %s"
,
err
.
Error
()))
return
}
sSysUser
:=
sService
.
SysUser
{}
reqSysUser
:=
sDto
.
SysUserUpdateReq
{}
e
.
MakeContext
(
c
)
.
MakeOrm
()
.
MakeService
(
&
sSysUser
.
Service
)
reqSysUser
.
Status
=
req
.
Status
reqSysUser
.
UserId
,
_
=
strconv
.
Atoi
(
userId
)
// 设置创建人
reqSysUser
.
SetUpdateBy
(
user
.
GetUserId
(
c
))
err
=
sSysUser
.
Update
(
&
reqSysUser
,
p
)
if
err
!=
nil
{
e
.
Logger
.
Error
(
err
)
e
.
Error
(
500
,
err
,
err
.
Error
())
return
}
e
.
OK
(
req
.
Id
,
"修改成功"
)
}
// Delete <球队>删除工作人员
// Delete <球队>删除工作人员
// @Summary <球队>删除工作人员
// @Summary <球队>删除工作人员
// @Description <球队>删除工作人员
// @Description <球队>删除工作人员
...
@@ -229,7 +279,7 @@ func (e OrgTeamUser) Delete(c *gin.Context) {
...
@@ -229,7 +279,7 @@ func (e OrgTeamUser) Delete(c *gin.Context) {
// req.SetUpdateBy(user.GetUserId(c))
// req.SetUpdateBy(user.GetUserId(c))
p
:=
actions
.
GetPermissionFromContext
(
c
)
p
:=
actions
.
GetPermissionFromContext
(
c
)
_
,
userIds
:=
s
.
GetUserId
(
req
.
Ids
)
_
,
userIds
:=
s
.
GetUserId
s
(
req
.
Ids
)
err
=
s
.
Remove
(
&
req
,
p
)
err
=
s
.
Remove
(
&
req
,
p
)
if
err
!=
nil
{
if
err
!=
nil
{
...
...
app/operate/models/org_player.go
View file @
c14432ef
...
@@ -18,6 +18,7 @@ type OrgPlayer struct {
...
@@ -18,6 +18,7 @@ type OrgPlayer struct {
PlayerImg
string
`json:"playerImg" gorm:"type:varchar(255);comment:球员照片"`
PlayerImg
string
`json:"playerImg" gorm:"type:varchar(255);comment:球员照片"`
PlayerUserId
string
`json:"playerUserId" gorm:"type:bigint(20);comment:org_player_user表id"`
PlayerUserId
string
`json:"playerUserId" gorm:"type:bigint(20);comment:org_player_user表id"`
ShareConf
string
`json:"shareConf" gorm:"type:tinyint(1);comment:分享功能 1 开启 2 关闭"`
ShareConf
string
`json:"shareConf" gorm:"type:tinyint(1);comment:分享功能 1 开启 2 关闭"`
Status
string
`json:"status" gorm:"type:tinyint(1);comment:状态 1 离队 2 在队"`
models
.
ModelTime
models
.
ModelTime
models
.
ControlBy
models
.
ControlBy
}
}
...
...
app/operate/router/org_player.go
View file @
c14432ef
...
@@ -21,6 +21,7 @@ func registerOrgPlayerRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMidd
...
@@ -21,6 +21,7 @@ func registerOrgPlayerRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMidd
r
.
GET
(
"/:id"
,
api
.
Get
)
r
.
GET
(
"/:id"
,
api
.
Get
)
r
.
POST
(
""
,
api
.
Insert
)
r
.
POST
(
""
,
api
.
Insert
)
r
.
PUT
(
"/:id"
,
api
.
Update
)
r
.
PUT
(
"/:id"
,
api
.
Update
)
r
.
PUT
(
"/update-status"
,
api
.
UpdateStatus
)
r
.
DELETE
(
""
,
api
.
Delete
)
r
.
DELETE
(
""
,
api
.
Delete
)
}
}
}
}
\ No newline at end of file
app/operate/router/org_player_user.go
View file @
c14432ef
...
@@ -23,4 +23,4 @@ func registerOrgPlayerUserRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWT
...
@@ -23,4 +23,4 @@ func registerOrgPlayerUserRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWT
r
.
PUT
(
"/:id"
,
api
.
Update
)
r
.
PUT
(
"/:id"
,
api
.
Update
)
r
.
DELETE
(
""
,
api
.
Delete
)
r
.
DELETE
(
""
,
api
.
Delete
)
}
}
}
}
\ No newline at end of file
app/operate/router/org_team_user.go
View file @
c14432ef
...
@@ -21,6 +21,7 @@ func registerOrgTeamUserRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMi
...
@@ -21,6 +21,7 @@ func registerOrgTeamUserRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMi
r
.
GET
(
"/:id"
,
api
.
Get
)
r
.
GET
(
"/:id"
,
api
.
Get
)
r
.
POST
(
""
,
api
.
Insert
)
r
.
POST
(
""
,
api
.
Insert
)
r
.
PUT
(
"/:id"
,
api
.
Update
)
r
.
PUT
(
"/:id"
,
api
.
Update
)
r
.
PUT
(
"/update-status"
,
api
.
UpdateStatus
)
r
.
DELETE
(
""
,
api
.
Delete
)
r
.
DELETE
(
""
,
api
.
Delete
)
}
}
}
}
\ No newline at end of file
app/operate/service/dto/org_match.go
View file @
c14432ef
...
@@ -30,8 +30,8 @@ type OrgMatchGetPageReply struct {
...
@@ -30,8 +30,8 @@ type OrgMatchGetPageReply struct {
TeamBName
string
`json:"team_b_name"`
TeamBName
string
`json:"team_b_name"`
TeamAId
string
`json:"teamAId"`
TeamAId
string
`json:"teamAId"`
TeamBId
string
`json:"teamBId"`
TeamBId
string
`json:"teamBId"`
MatchStartTime
time
.
Time
`json:"matchStartTime
Order
"`
MatchStartTime
time
.
Time
`json:"matchStartTime"`
MatchEndTime
time
.
Time
`json:"matchEndTime
Order
"`
MatchEndTime
time
.
Time
`json:"matchEndTime"`
Status
string
`json:"status"`
Status
string
`json:"status"`
}
}
...
...
app/operate/service/dto/org_player.go
View file @
c14432ef
...
@@ -103,6 +103,12 @@ type OrgPlayerUpdateReq struct {
...
@@ -103,6 +103,12 @@ type OrgPlayerUpdateReq struct {
ShareConf
string
`json:"shareConf" comment:"分享功能 1 开启 2 关闭"`
ShareConf
string
`json:"shareConf" comment:"分享功能 1 开启 2 关闭"`
PlayerNameEn
string
`json:"playerNameEn" comment:"球员名称英文"`
PlayerNameEn
string
`json:"playerNameEn" comment:"球员名称英文"`
Username
string
`json:"username" comment:"账号"`
Username
string
`json:"username" comment:"账号"`
Status
string
`json:"status" comment:"状态 1 离队 2 在队"`
//状态 1 离队 2 在队
common
.
ControlBy
}
type
OrgPlayerUpdateStatusReq
struct
{
Id
int
`json:"id" comment:""`
//
Status
string
`json:"status" comment:"状态 1 离队 2 在队"`
//状态 1 离队 2 在队
common
.
ControlBy
common
.
ControlBy
}
}
...
@@ -120,6 +126,7 @@ func (s *OrgPlayerUpdateReq) Generate(model *models.OrgPlayer) {
...
@@ -120,6 +126,7 @@ func (s *OrgPlayerUpdateReq) Generate(model *models.OrgPlayer) {
model
.
PlayerImg
=
s
.
PlayerImg
model
.
PlayerImg
=
s
.
PlayerImg
model
.
PlayerUserId
=
s
.
PlayerUserId
model
.
PlayerUserId
=
s
.
PlayerUserId
model
.
ShareConf
=
s
.
ShareConf
model
.
ShareConf
=
s
.
ShareConf
model
.
Status
=
s
.
Status
}
}
func
(
s
*
OrgPlayerUpdateReq
)
GetId
()
interface
{}
{
func
(
s
*
OrgPlayerUpdateReq
)
GetId
()
interface
{}
{
...
@@ -146,7 +153,7 @@ type OrgPlayerGetReply struct {
...
@@ -146,7 +153,7 @@ type OrgPlayerGetReply struct {
PlayerImg
string
`json:"playerImg" comment:"球员照片"`
PlayerImg
string
`json:"playerImg" comment:"球员照片"`
Username
string
`json:"username" comment:"账号"`
Username
string
`json:"username" comment:"账号"`
ShareConf
string
`json:"shareConf" comment:"分享功能 1 开启 2 关闭"`
ShareConf
string
`json:"shareConf" comment:"分享功能 1 开启 2 关闭"`
Status
string
`json:"status" comment:"状态
"`
Status
string
`json:"status" comment:"状态
1 离队 2 在队"`
//1 离队 2 在队
}
}
func
(
s
*
OrgPlayerGetReq
)
GetId
()
interface
{}
{
func
(
s
*
OrgPlayerGetReq
)
GetId
()
interface
{}
{
...
...
app/operate/service/dto/org_team_user.go
View file @
c14432ef
...
@@ -71,6 +71,13 @@ type OrgTeamUserUpdateReq struct {
...
@@ -71,6 +71,13 @@ type OrgTeamUserUpdateReq struct {
UserImg
string
`json:"userImg" comment:"用户照片"`
UserImg
string
`json:"userImg" comment:"用户照片"`
SignImg
string
`json:"signImg" comment:"签名照片"`
SignImg
string
`json:"signImg" comment:"签名照片"`
UserName
string
`json:"userName" comment:"账号"`
UserName
string
`json:"userName" comment:"账号"`
Status
string
`json:"status" comment:"状态 1 离职 2 在职"`
//状态 1 离职 2 在职
common
.
ControlBy
}
type
OrgTeamUserUpdateStatusReq
struct
{
Id
int
`json:"id" comment:""`
//
Status
string
`json:"status" comment:"状态 1 离职 2 在职"`
//状态 1 离职 2 在职
common
.
ControlBy
common
.
ControlBy
}
}
...
...
app/operate/service/org_ad.go
View file @
c14432ef
...
@@ -3,7 +3,7 @@ package service
...
@@ -3,7 +3,7 @@ package service
import
(
import
(
"errors"
"errors"
"github.com/go-admin-team/go-admin-core/sdk/service"
"github.com/go-admin-team/go-admin-core/sdk/service"
"gorm.io/gorm"
"gorm.io/gorm"
"go-admin/app/operate/models"
"go-admin/app/operate/models"
...
@@ -59,9 +59,9 @@ func (e *OrgAd) Get(d *dto.OrgAdGetReq, p *actions.DataPermission, model *models
...
@@ -59,9 +59,9 @@ func (e *OrgAd) Get(d *dto.OrgAdGetReq, p *actions.DataPermission, model *models
// Insert 创建OrgAd对象
// Insert 创建OrgAd对象
func
(
e
*
OrgAd
)
Insert
(
c
*
dto
.
OrgAdInsertReq
)
error
{
func
(
e
*
OrgAd
)
Insert
(
c
*
dto
.
OrgAdInsertReq
)
error
{
var
err
error
var
err
error
var
data
models
.
OrgAd
var
data
models
.
OrgAd
c
.
Generate
(
&
data
)
c
.
Generate
(
&
data
)
err
=
e
.
Orm
.
Create
(
&
data
)
.
Error
err
=
e
.
Orm
.
Create
(
&
data
)
.
Error
if
err
!=
nil
{
if
err
!=
nil
{
e
.
Log
.
Errorf
(
"OrgAdService Insert error:%s
\r\n
"
,
err
)
e
.
Log
.
Errorf
(
"OrgAdService Insert error:%s
\r\n
"
,
err
)
...
@@ -72,22 +72,22 @@ func (e *OrgAd) Insert(c *dto.OrgAdInsertReq) error {
...
@@ -72,22 +72,22 @@ func (e *OrgAd) Insert(c *dto.OrgAdInsertReq) error {
// Update 修改OrgAd对象
// Update 修改OrgAd对象
func
(
e
*
OrgAd
)
Update
(
c
*
dto
.
OrgAdUpdateReq
,
p
*
actions
.
DataPermission
)
error
{
func
(
e
*
OrgAd
)
Update
(
c
*
dto
.
OrgAdUpdateReq
,
p
*
actions
.
DataPermission
)
error
{
var
err
error
var
err
error
var
data
=
models
.
OrgAd
{}
var
data
=
models
.
OrgAd
{}
e
.
Orm
.
Scopes
(
e
.
Orm
.
Scopes
(
actions
.
Permission
(
data
.
TableName
(),
p
),
actions
.
Permission
(
data
.
TableName
(),
p
),
)
.
First
(
&
data
,
c
.
GetId
())
)
.
First
(
&
data
,
c
.
GetId
())
c
.
Generate
(
&
data
)
c
.
Generate
(
&
data
)
db
:=
e
.
Orm
.
Save
(
&
data
)
db
:=
e
.
Orm
.
Updates
(
&
data
)
if
db
.
Error
!=
nil
{
if
db
.
Error
!=
nil
{
e
.
Log
.
Errorf
(
"OrgAdService Save error:%s
\r\n
"
,
err
)
e
.
Log
.
Errorf
(
"OrgAdService Save error:%s
\r\n
"
,
err
)
return
err
return
err
}
}
if
db
.
RowsAffected
==
0
{
if
db
.
RowsAffected
==
0
{
return
errors
.
New
(
"无权更新该数据"
)
return
errors
.
New
(
"无权更新该数据"
)
}
}
return
nil
return
nil
}
}
// Remove 删除OrgAd
// Remove 删除OrgAd
...
@@ -99,11 +99,11 @@ func (e *OrgAd) Remove(d *dto.OrgAdDeleteReq, p *actions.DataPermission) error {
...
@@ -99,11 +99,11 @@ func (e *OrgAd) Remove(d *dto.OrgAdDeleteReq, p *actions.DataPermission) error {
actions
.
Permission
(
data
.
TableName
(),
p
),
actions
.
Permission
(
data
.
TableName
(),
p
),
)
.
Delete
(
&
data
,
d
.
GetId
())
)
.
Delete
(
&
data
,
d
.
GetId
())
if
err
:=
db
.
Error
;
err
!=
nil
{
if
err
:=
db
.
Error
;
err
!=
nil
{
e
.
Log
.
Errorf
(
"Service RemoveOrgAd error:%s
\r\n
"
,
err
)
e
.
Log
.
Errorf
(
"Service RemoveOrgAd error:%s
\r\n
"
,
err
)
return
err
return
err
}
}
if
db
.
RowsAffected
==
0
{
if
db
.
RowsAffected
==
0
{
return
errors
.
New
(
"无权删除该数据"
)
return
errors
.
New
(
"无权删除该数据"
)
}
}
return
nil
return
nil
}
}
\ No newline at end of file
app/operate/service/org_club_user.go
View file @
c14432ef
...
@@ -124,7 +124,7 @@ func (e *OrgClubUser) Update(c *dto.OrgClubUserUpdateReq, p *actions.DataPermiss
...
@@ -124,7 +124,7 @@ func (e *OrgClubUser) Update(c *dto.OrgClubUserUpdateReq, p *actions.DataPermiss
)
.
First
(
&
data
,
c
.
GetId
())
)
.
First
(
&
data
,
c
.
GetId
())
c
.
Generate
(
&
data
)
c
.
Generate
(
&
data
)
db
:=
e
.
Orm
.
Save
(
&
data
)
db
:=
e
.
Orm
.
Updates
(
&
data
)
if
db
.
Error
!=
nil
{
if
db
.
Error
!=
nil
{
e
.
Log
.
Errorf
(
"OrgClubUserService Save error:%s
\r\n
"
,
err
)
e
.
Log
.
Errorf
(
"OrgClubUserService Save error:%s
\r\n
"
,
err
)
return
err
return
err
...
...
app/operate/service/org_division.go
View file @
c14432ef
...
@@ -3,7 +3,7 @@ package service
...
@@ -3,7 +3,7 @@ package service
import
(
import
(
"errors"
"errors"
"github.com/go-admin-team/go-admin-core/sdk/service"
"github.com/go-admin-team/go-admin-core/sdk/service"
"gorm.io/gorm"
"gorm.io/gorm"
"go-admin/app/operate/models"
"go-admin/app/operate/models"
...
@@ -59,9 +59,9 @@ func (e *OrgDivision) Get(d *dto.OrgDivisionGetReq, p *actions.DataPermission, m
...
@@ -59,9 +59,9 @@ func (e *OrgDivision) Get(d *dto.OrgDivisionGetReq, p *actions.DataPermission, m
// Insert 创建OrgDivision对象
// Insert 创建OrgDivision对象
func
(
e
*
OrgDivision
)
Insert
(
c
*
dto
.
OrgDivisionInsertReq
)
error
{
func
(
e
*
OrgDivision
)
Insert
(
c
*
dto
.
OrgDivisionInsertReq
)
error
{
var
err
error
var
err
error
var
data
models
.
OrgDivision
var
data
models
.
OrgDivision
c
.
Generate
(
&
data
)
c
.
Generate
(
&
data
)
err
=
e
.
Orm
.
Create
(
&
data
)
.
Error
err
=
e
.
Orm
.
Create
(
&
data
)
.
Error
if
err
!=
nil
{
if
err
!=
nil
{
e
.
Log
.
Errorf
(
"OrgDivisionService Insert error:%s
\r\n
"
,
err
)
e
.
Log
.
Errorf
(
"OrgDivisionService Insert error:%s
\r\n
"
,
err
)
...
@@ -72,22 +72,22 @@ func (e *OrgDivision) Insert(c *dto.OrgDivisionInsertReq) error {
...
@@ -72,22 +72,22 @@ func (e *OrgDivision) Insert(c *dto.OrgDivisionInsertReq) error {
// Update 修改OrgDivision对象
// Update 修改OrgDivision对象
func
(
e
*
OrgDivision
)
Update
(
c
*
dto
.
OrgDivisionUpdateReq
,
p
*
actions
.
DataPermission
)
error
{
func
(
e
*
OrgDivision
)
Update
(
c
*
dto
.
OrgDivisionUpdateReq
,
p
*
actions
.
DataPermission
)
error
{
var
err
error
var
err
error
var
data
=
models
.
OrgDivision
{}
var
data
=
models
.
OrgDivision
{}
e
.
Orm
.
Scopes
(
e
.
Orm
.
Scopes
(
actions
.
Permission
(
data
.
TableName
(),
p
),
actions
.
Permission
(
data
.
TableName
(),
p
),
)
.
First
(
&
data
,
c
.
GetId
())
)
.
First
(
&
data
,
c
.
GetId
())
c
.
Generate
(
&
data
)
c
.
Generate
(
&
data
)
db
:=
e
.
Orm
.
Save
(
&
data
)
db
:=
e
.
Orm
.
Updates
(
&
data
)
if
db
.
Error
!=
nil
{
if
db
.
Error
!=
nil
{
e
.
Log
.
Errorf
(
"OrgDivisionService Save error:%s
\r\n
"
,
err
)
e
.
Log
.
Errorf
(
"OrgDivisionService Save error:%s
\r\n
"
,
err
)
return
err
return
err
}
}
if
db
.
RowsAffected
==
0
{
if
db
.
RowsAffected
==
0
{
return
errors
.
New
(
"无权更新该数据"
)
return
errors
.
New
(
"无权更新该数据"
)
}
}
return
nil
return
nil
}
}
// Remove 删除OrgDivision
// Remove 删除OrgDivision
...
@@ -99,11 +99,11 @@ func (e *OrgDivision) Remove(d *dto.OrgDivisionDeleteReq, p *actions.DataPermiss
...
@@ -99,11 +99,11 @@ func (e *OrgDivision) Remove(d *dto.OrgDivisionDeleteReq, p *actions.DataPermiss
actions
.
Permission
(
data
.
TableName
(),
p
),
actions
.
Permission
(
data
.
TableName
(),
p
),
)
.
Delete
(
&
data
,
d
.
GetId
())
)
.
Delete
(
&
data
,
d
.
GetId
())
if
err
:=
db
.
Error
;
err
!=
nil
{
if
err
:=
db
.
Error
;
err
!=
nil
{
e
.
Log
.
Errorf
(
"Service RemoveOrgDivision error:%s
\r\n
"
,
err
)
e
.
Log
.
Errorf
(
"Service RemoveOrgDivision error:%s
\r\n
"
,
err
)
return
err
return
err
}
}
if
db
.
RowsAffected
==
0
{
if
db
.
RowsAffected
==
0
{
return
errors
.
New
(
"无权删除该数据"
)
return
errors
.
New
(
"无权删除该数据"
)
}
}
return
nil
return
nil
}
}
\ No newline at end of file
app/operate/service/org_league.go
View file @
c14432ef
...
@@ -3,7 +3,7 @@ package service
...
@@ -3,7 +3,7 @@ package service
import
(
import
(
"errors"
"errors"
"github.com/go-admin-team/go-admin-core/sdk/service"
"github.com/go-admin-team/go-admin-core/sdk/service"
"gorm.io/gorm"
"gorm.io/gorm"
"go-admin/app/operate/models"
"go-admin/app/operate/models"
...
@@ -59,9 +59,9 @@ func (e *OrgLeague) Get(d *dto.OrgLeagueGetReq, p *actions.DataPermission, model
...
@@ -59,9 +59,9 @@ func (e *OrgLeague) Get(d *dto.OrgLeagueGetReq, p *actions.DataPermission, model
// Insert 创建OrgLeague对象
// Insert 创建OrgLeague对象
func
(
e
*
OrgLeague
)
Insert
(
c
*
dto
.
OrgLeagueInsertReq
)
error
{
func
(
e
*
OrgLeague
)
Insert
(
c
*
dto
.
OrgLeagueInsertReq
)
error
{
var
err
error
var
err
error
var
data
models
.
OrgLeague
var
data
models
.
OrgLeague
c
.
Generate
(
&
data
)
c
.
Generate
(
&
data
)
err
=
e
.
Orm
.
Create
(
&
data
)
.
Error
err
=
e
.
Orm
.
Create
(
&
data
)
.
Error
if
err
!=
nil
{
if
err
!=
nil
{
e
.
Log
.
Errorf
(
"OrgLeagueService Insert error:%s
\r\n
"
,
err
)
e
.
Log
.
Errorf
(
"OrgLeagueService Insert error:%s
\r\n
"
,
err
)
...
@@ -72,22 +72,22 @@ func (e *OrgLeague) Insert(c *dto.OrgLeagueInsertReq) error {
...
@@ -72,22 +72,22 @@ func (e *OrgLeague) Insert(c *dto.OrgLeagueInsertReq) error {
// Update 修改OrgLeague对象
// Update 修改OrgLeague对象
func
(
e
*
OrgLeague
)
Update
(
c
*
dto
.
OrgLeagueUpdateReq
,
p
*
actions
.
DataPermission
)
error
{
func
(
e
*
OrgLeague
)
Update
(
c
*
dto
.
OrgLeagueUpdateReq
,
p
*
actions
.
DataPermission
)
error
{
var
err
error
var
err
error
var
data
=
models
.
OrgLeague
{}
var
data
=
models
.
OrgLeague
{}
e
.
Orm
.
Scopes
(
e
.
Orm
.
Scopes
(
actions
.
Permission
(
data
.
TableName
(),
p
),
actions
.
Permission
(
data
.
TableName
(),
p
),
)
.
First
(
&
data
,
c
.
GetId
())
)
.
First
(
&
data
,
c
.
GetId
())
c
.
Generate
(
&
data
)
c
.
Generate
(
&
data
)
db
:=
e
.
Orm
.
Save
(
&
data
)
db
:=
e
.
Orm
.
Updates
(
&
data
)
if
db
.
Error
!=
nil
{
if
db
.
Error
!=
nil
{
e
.
Log
.
Errorf
(
"OrgLeagueService Save error:%s
\r\n
"
,
err
)
e
.
Log
.
Errorf
(
"OrgLeagueService Save error:%s
\r\n
"
,
err
)
return
err
return
err
}
}
if
db
.
RowsAffected
==
0
{
if
db
.
RowsAffected
==
0
{
return
errors
.
New
(
"无权更新该数据"
)
return
errors
.
New
(
"无权更新该数据"
)
}
}
return
nil
return
nil
}
}
// Remove 删除OrgLeague
// Remove 删除OrgLeague
...
@@ -99,11 +99,11 @@ func (e *OrgLeague) Remove(d *dto.OrgLeagueDeleteReq, p *actions.DataPermission)
...
@@ -99,11 +99,11 @@ func (e *OrgLeague) Remove(d *dto.OrgLeagueDeleteReq, p *actions.DataPermission)
actions
.
Permission
(
data
.
TableName
(),
p
),
actions
.
Permission
(
data
.
TableName
(),
p
),
)
.
Delete
(
&
data
,
d
.
GetId
())
)
.
Delete
(
&
data
,
d
.
GetId
())
if
err
:=
db
.
Error
;
err
!=
nil
{
if
err
:=
db
.
Error
;
err
!=
nil
{
e
.
Log
.
Errorf
(
"Service RemoveOrgLeague error:%s
\r\n
"
,
err
)
e
.
Log
.
Errorf
(
"Service RemoveOrgLeague error:%s
\r\n
"
,
err
)
return
err
return
err
}
}
if
db
.
RowsAffected
==
0
{
if
db
.
RowsAffected
==
0
{
return
errors
.
New
(
"无权删除该数据"
)
return
errors
.
New
(
"无权删除该数据"
)
}
}
return
nil
return
nil
}
}
\ No newline at end of file
app/operate/service/org_match.go
View file @
c14432ef
...
@@ -117,7 +117,7 @@ func (e *OrgMatch) Update(c *dto.OrgMatchUpdateReq, p *actions.DataPermission) e
...
@@ -117,7 +117,7 @@ func (e *OrgMatch) Update(c *dto.OrgMatchUpdateReq, p *actions.DataPermission) e
)
.
First
(
&
data
,
c
.
GetId
())
)
.
First
(
&
data
,
c
.
GetId
())
c
.
Generate
(
&
data
)
c
.
Generate
(
&
data
)
db
:=
e
.
Orm
.
Save
(
&
data
)
db
:=
e
.
Orm
.
Updates
(
&
data
)
if
db
.
Error
!=
nil
{
if
db
.
Error
!=
nil
{
e
.
Log
.
Errorf
(
"OrgMatchService Save error:%s
\r\n
"
,
err
)
e
.
Log
.
Errorf
(
"OrgMatchService Save error:%s
\r\n
"
,
err
)
return
err
return
err
...
...
app/operate/service/org_news.go
View file @
c14432ef
...
@@ -3,7 +3,7 @@ package service
...
@@ -3,7 +3,7 @@ package service
import
(
import
(
"errors"
"errors"
"github.com/go-admin-team/go-admin-core/sdk/service"
"github.com/go-admin-team/go-admin-core/sdk/service"
"gorm.io/gorm"
"gorm.io/gorm"
"go-admin/app/operate/models"
"go-admin/app/operate/models"
...
@@ -59,9 +59,9 @@ func (e *OrgNews) Get(d *dto.OrgNewsGetReq, p *actions.DataPermission, model *mo
...
@@ -59,9 +59,9 @@ func (e *OrgNews) Get(d *dto.OrgNewsGetReq, p *actions.DataPermission, model *mo
// Insert 创建OrgNews对象
// Insert 创建OrgNews对象
func
(
e
*
OrgNews
)
Insert
(
c
*
dto
.
OrgNewsInsertReq
)
error
{
func
(
e
*
OrgNews
)
Insert
(
c
*
dto
.
OrgNewsInsertReq
)
error
{
var
err
error
var
err
error
var
data
models
.
OrgNews
var
data
models
.
OrgNews
c
.
Generate
(
&
data
)
c
.
Generate
(
&
data
)
err
=
e
.
Orm
.
Create
(
&
data
)
.
Error
err
=
e
.
Orm
.
Create
(
&
data
)
.
Error
if
err
!=
nil
{
if
err
!=
nil
{
e
.
Log
.
Errorf
(
"OrgNewsService Insert error:%s
\r\n
"
,
err
)
e
.
Log
.
Errorf
(
"OrgNewsService Insert error:%s
\r\n
"
,
err
)
...
@@ -72,22 +72,22 @@ func (e *OrgNews) Insert(c *dto.OrgNewsInsertReq) error {
...
@@ -72,22 +72,22 @@ func (e *OrgNews) Insert(c *dto.OrgNewsInsertReq) error {
// Update 修改OrgNews对象
// Update 修改OrgNews对象
func
(
e
*
OrgNews
)
Update
(
c
*
dto
.
OrgNewsUpdateReq
,
p
*
actions
.
DataPermission
)
error
{
func
(
e
*
OrgNews
)
Update
(
c
*
dto
.
OrgNewsUpdateReq
,
p
*
actions
.
DataPermission
)
error
{
var
err
error
var
err
error
var
data
=
models
.
OrgNews
{}
var
data
=
models
.
OrgNews
{}
e
.
Orm
.
Scopes
(
e
.
Orm
.
Scopes
(
actions
.
Permission
(
data
.
TableName
(),
p
),
actions
.
Permission
(
data
.
TableName
(),
p
),
)
.
First
(
&
data
,
c
.
GetId
())
)
.
First
(
&
data
,
c
.
GetId
())
c
.
Generate
(
&
data
)
c
.
Generate
(
&
data
)
db
:=
e
.
Orm
.
Save
(
&
data
)
db
:=
e
.
Orm
.
Updates
(
&
data
)
if
db
.
Error
!=
nil
{
if
db
.
Error
!=
nil
{
e
.
Log
.
Errorf
(
"OrgNewsService Save error:%s
\r\n
"
,
err
)
e
.
Log
.
Errorf
(
"OrgNewsService Save error:%s
\r\n
"
,
err
)
return
err
return
err
}
}
if
db
.
RowsAffected
==
0
{
if
db
.
RowsAffected
==
0
{
return
errors
.
New
(
"无权更新该数据"
)
return
errors
.
New
(
"无权更新该数据"
)
}
}
return
nil
return
nil
}
}
// Remove 删除OrgNews
// Remove 删除OrgNews
...
@@ -99,11 +99,11 @@ func (e *OrgNews) Remove(d *dto.OrgNewsDeleteReq, p *actions.DataPermission) err
...
@@ -99,11 +99,11 @@ func (e *OrgNews) Remove(d *dto.OrgNewsDeleteReq, p *actions.DataPermission) err
actions
.
Permission
(
data
.
TableName
(),
p
),
actions
.
Permission
(
data
.
TableName
(),
p
),
)
.
Delete
(
&
data
,
d
.
GetId
())
)
.
Delete
(
&
data
,
d
.
GetId
())
if
err
:=
db
.
Error
;
err
!=
nil
{
if
err
:=
db
.
Error
;
err
!=
nil
{
e
.
Log
.
Errorf
(
"Service RemoveOrgNews error:%s
\r\n
"
,
err
)
e
.
Log
.
Errorf
(
"Service RemoveOrgNews error:%s
\r\n
"
,
err
)
return
err
return
err
}
}
if
db
.
RowsAffected
==
0
{
if
db
.
RowsAffected
==
0
{
return
errors
.
New
(
"无权删除该数据"
)
return
errors
.
New
(
"无权删除该数据"
)
}
}
return
nil
return
nil
}
}
\ No newline at end of file
app/operate/service/org_player.go
View file @
c14432ef
...
@@ -91,7 +91,7 @@ func (e *OrgPlayer) Update(c *dto.OrgPlayerUpdateReq, p *actions.DataPermission)
...
@@ -91,7 +91,7 @@ func (e *OrgPlayer) Update(c *dto.OrgPlayerUpdateReq, p *actions.DataPermission)
)
.
First
(
&
data
,
c
.
GetId
())
)
.
First
(
&
data
,
c
.
GetId
())
c
.
Generate
(
&
data
)
c
.
Generate
(
&
data
)
db
:=
e
.
Orm
.
Save
(
&
data
)
db
:=
e
.
Orm
.
Updates
(
&
data
)
if
db
.
Error
!=
nil
{
if
db
.
Error
!=
nil
{
e
.
Log
.
Errorf
(
"OrgPlayerService Save error:%s
\r\n
"
,
err
)
e
.
Log
.
Errorf
(
"OrgPlayerService Save error:%s
\r\n
"
,
err
)
return
err
return
err
...
...
app/operate/service/org_player_user.go
View file @
c14432ef
...
@@ -80,7 +80,7 @@ func (e *OrgPlayerUser) Update(c *dto.OrgPlayerUserUpdateReq, p *actions.DataPer
...
@@ -80,7 +80,7 @@ func (e *OrgPlayerUser) Update(c *dto.OrgPlayerUserUpdateReq, p *actions.DataPer
)
.
First
(
&
data
,
c
.
GetId
())
)
.
First
(
&
data
,
c
.
GetId
())
c
.
Generate
(
&
data
)
c
.
Generate
(
&
data
)
db
:=
e
.
Orm
.
Save
(
&
data
)
db
:=
e
.
Orm
.
Updates
(
&
data
)
if
db
.
Error
!=
nil
{
if
db
.
Error
!=
nil
{
e
.
Log
.
Errorf
(
"OrgPlayerUserService Save error:%s
\r\n
"
,
err
)
e
.
Log
.
Errorf
(
"OrgPlayerUserService Save error:%s
\r\n
"
,
err
)
return
err
return
err
...
...
app/operate/service/org_season.go
View file @
c14432ef
...
@@ -83,7 +83,7 @@ func (e *OrgSeason) Update(c *dto.OrgSeasonUpdateReq, p *actions.DataPermission)
...
@@ -83,7 +83,7 @@ func (e *OrgSeason) Update(c *dto.OrgSeasonUpdateReq, p *actions.DataPermission)
)
.
First
(
&
data
,
c
.
GetId
())
)
.
First
(
&
data
,
c
.
GetId
())
c
.
Generate
(
&
data
)
c
.
Generate
(
&
data
)
db
:=
e
.
Orm
.
Save
(
&
data
)
db
:=
e
.
Orm
.
Updates
(
&
data
)
if
db
.
Error
!=
nil
{
if
db
.
Error
!=
nil
{
e
.
Log
.
Errorf
(
"OrgSeasonService Save error:%s
\r\n
"
,
err
)
e
.
Log
.
Errorf
(
"OrgSeasonService Save error:%s
\r\n
"
,
err
)
return
err
return
err
...
...
app/operate/service/org_team_user.go
View file @
c14432ef
...
@@ -123,7 +123,7 @@ func (e *OrgTeamUser) Remove(d *dto.OrgTeamUserDeleteReq, p *actions.DataPermiss
...
@@ -123,7 +123,7 @@ func (e *OrgTeamUser) Remove(d *dto.OrgTeamUserDeleteReq, p *actions.DataPermiss
}
}
// GetPage 获取OrgTeamUser列表
// GetPage 获取OrgTeamUser列表
func
(
e
*
OrgTeamUser
)
GetUserId
(
ids
[]
int
)
(
error
,
[]
int
)
{
func
(
e
*
OrgTeamUser
)
GetUserId
s
(
ids
[]
int
)
(
error
,
[]
int
)
{
list
:=
make
([]
models
.
OrgTeamUser
,
0
)
list
:=
make
([]
models
.
OrgTeamUser
,
0
)
field
:=
"user_id"
field
:=
"user_id"
...
@@ -152,3 +152,18 @@ func (e *OrgTeamUser) GetTeamId(userId int) (error, string) {
...
@@ -152,3 +152,18 @@ func (e *OrgTeamUser) GetTeamId(userId int) (error, string) {
}
}
return
nil
,
data
.
TeamId
return
nil
,
data
.
TeamId
}
}
// Get 获取OrgClubUser对象
func
(
e
*
OrgTeamUser
)
GetUserId
(
teamId
int
)
(
error
,
string
)
{
data
:=
new
(
models
.
OrgTeamUser
)
err
:=
e
.
Orm
.
Table
(
"org_team_user"
)
.
Select
(
"user_id"
)
.
Where
(
"team_id=?"
,
teamId
)
.
First
(
&
data
)
.
Error
if
err
!=
nil
{
e
.
Log
.
Errorf
(
"db error:%s"
,
err
)
return
err
,
""
}
return
nil
,
data
.
UserId
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment