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
6f7e1417
Commit
6f7e1417
authored
3 years ago
by
haoyanbin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
team_user
parent
659ccb42
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
119 additions
and
40 deletions
+119
-40
org_club.go
app/operate/apis/org_club.go
+2
-2
org_team_user.go
app/operate/apis/org_team_user.go
+35
-0
org_club.go
app/operate/service/dto/org_club.go
+1
-1
org_team_user.go
app/operate/service/dto/org_team_user.go
+11
-8
org_club_user.go
app/operate/service/org_club_user.go
+19
-1
org_team.go
app/operate/service/org_team.go
+28
-26
org_team_user.go
app/operate/service/org_team_user.go
+23
-2
No files found.
app/operate/apis/org_club.go
View file @
6f7e1417
...
...
@@ -267,12 +267,12 @@ func (e OrgClub) Delete(c *gin.Context) {
sOrgClubUser
:=
service
.
OrgClubUser
{}
e
.
MakeContext
(
c
)
.
MakeOrm
()
.
MakeService
(
&
sOrgClubUser
.
Service
)
_
,
userId
:=
sOrgClubUser
.
GetUserId
(
req
.
GetId
()
.
(
int
))
_
,
userId
:=
sOrgClubUser
.
GetUserId
s
(
req
.
GetId
()
.
([]
int
))
sSysUser
:=
sService
.
SysUser
{}
reqSysUser
:=
sDto
.
SysUserById
{}
e
.
MakeContext
(
c
)
.
MakeOrm
()
.
MakeService
(
&
sSysUser
.
Service
)
reqSysUser
.
Id
,
_
=
strconv
.
Atoi
(
userId
)
reqSysUser
.
Id
s
=
userId
// 设置编辑人
reqSysUser
.
SetUpdateBy
(
user
.
GetUserId
(
c
))
...
...
This diff is collapsed.
Click to expand it.
app/operate/apis/org_team_user.go
View file @
6f7e1417
...
...
@@ -182,6 +182,25 @@ func (e OrgTeamUser) Update(c *gin.Context) {
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
.
Username
=
req
.
UserName
reqSysUser
.
NickName
=
req
.
Name
reqSysUser
.
NickNameEn
=
req
.
NameEn
reqSysUser
.
Phone
=
req
.
UserName
reqSysUser
.
UserId
,
_
=
strconv
.
Atoi
(
req
.
UserId
)
// 设置创建人
reqSysUser
.
SetCreateBy
(
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
.
GetId
(),
"修改成功"
)
}
...
...
@@ -210,10 +229,26 @@ func (e OrgTeamUser) Delete(c *gin.Context) {
// req.SetUpdateBy(user.GetUserId(c))
p
:=
actions
.
GetPermissionFromContext
(
c
)
_
,
userIds
:=
s
.
GetUserId
(
req
.
Ids
)
err
=
s
.
Remove
(
&
req
,
p
)
if
err
!=
nil
{
e
.
Error
(
500
,
err
,
fmt
.
Sprintf
(
"删除球队人员账户信息失败,
\r\n
失败信息 %s"
,
err
.
Error
()))
return
}
sSysUser
:=
sService
.
SysUser
{}
reqSysUser
:=
sDto
.
SysUserById
{}
e
.
MakeContext
(
c
)
.
MakeOrm
()
.
MakeService
(
&
sSysUser
.
Service
)
reqSysUser
.
Ids
=
userIds
// 设置编辑人
reqSysUser
.
SetUpdateBy
(
user
.
GetUserId
(
c
))
err
=
sSysUser
.
Remove
(
&
reqSysUser
,
p
)
if
err
!=
nil
{
e
.
Logger
.
Error
(
err
)
return
}
e
.
OK
(
req
.
GetId
(),
"删除成功"
)
}
This diff is collapsed.
Click to expand it.
app/operate/service/dto/org_club.go
View file @
6f7e1417
...
...
@@ -86,7 +86,7 @@ func (s *OrgClubGetReq) GetId() interface{} {
// OrgClubDeleteReq 功能删除请求参数
type
OrgClubDeleteReq
struct
{
Ids
int
`json:"ids"`
Ids
[]
int
`json:"ids"`
}
func
(
s
*
OrgClubDeleteReq
)
GetId
()
interface
{}
{
...
...
This diff is collapsed.
Click to expand it.
app/operate/service/dto/org_team_user.go
View file @
6f7e1417
...
...
@@ -63,11 +63,14 @@ type OrgTeamUserUpdateReq struct {
Id
int
`uri:"id" comment:""`
//
ClubId
string
`json:"clubId" comment:"org_club表id"`
TeamId
string
`json:"teamId" comment:"org_team表id"`
RoleId
string
`json:"roleId" comment:"角色id"`
UserId
string
`json:"userId" comment:"sys_user表id"`
Name
string
`json:"name" comment:"姓名"`
NameEn
string
`json:"name_en" comment:"姓名"`
Sex
string
`json:"sex" comment:"性别"`
UserImg
string
`json:"userImg" comment:"用户照片"`
SignImg
string
`json:"signImg" comment:"签名照片"`
UserName
string
`json:"userName" comment:"账号"`
common
.
ControlBy
}
...
...
This diff is collapsed.
Click to expand it.
app/operate/service/org_club_user.go
View file @
6f7e1417
...
...
@@ -2,6 +2,7 @@ package service
import
(
"errors"
"strconv"
"github.com/go-admin-team/go-admin-core/sdk/service"
"gorm.io/gorm"
...
...
@@ -57,7 +58,6 @@ func (e *OrgClubUser) Get(d *dto.OrgClubUserGetReq, p *actions.DataPermission, m
return
nil
}
// Get 获取OrgClubUser对象
func
(
e
*
OrgClubUser
)
GetUserId
(
clubId
int
)
(
error
,
string
)
{
data
:=
new
(
models
.
OrgClubUser
)
...
...
@@ -69,6 +69,24 @@ func (e *OrgClubUser) GetUserId(clubId int) (error, string) {
return
nil
,
data
.
UserId
}
// Get 获取OrgClubUser对象
func
(
e
*
OrgClubUser
)
GetUserIds
(
clubId
[]
int
)
(
error
,
[]
int
)
{
data
:=
make
([]
models
.
OrgClubUser
,
0
)
e
.
Orm
.
Table
(
"org_club_user"
)
.
Select
(
"user_id,club_id"
)
.
Where
(
"club_id IN(?)"
,
clubId
)
.
First
(
&
data
)
ids
:=
make
([]
int
,
0
)
id
:=
0
for
_
,
v
:=
range
data
{
id
,
_
=
strconv
.
Atoi
(
v
.
UserId
)
ids
=
append
(
ids
,
id
)
}
return
nil
,
ids
}
// Get 获取OrgClubUser对象
func
(
e
*
OrgClubUser
)
GetClubId
(
userId
int
)
(
error
,
string
)
{
data
:=
new
(
models
.
OrgClubUser
)
...
...
This diff is collapsed.
Click to expand it.
app/operate/service/org_team.go
View file @
6f7e1417
...
...
@@ -67,6 +67,7 @@ func (e *OrgTeam) Insert(c *dto.OrgTeamInsertReq) error {
e
.
Log
.
Errorf
(
"OrgTeamService Insert error:%s
\r\n
"
,
err
)
return
err
}
c
.
Id
=
data
.
Id
return
nil
}
...
...
@@ -79,7 +80,7 @@ func (e *OrgTeam) Update(c *dto.OrgTeamUpdateReq, p *actions.DataPermission) err
)
.
First
(
&
data
,
c
.
GetId
())
c
.
Generate
(
&
data
)
db
:=
e
.
Orm
.
Save
(
&
data
)
db
:=
e
.
Orm
.
Updates
(
&
data
)
if
db
.
Error
!=
nil
{
e
.
Log
.
Errorf
(
"OrgTeamService Save error:%s
\r\n
"
,
err
)
return
err
...
...
@@ -87,6 +88,7 @@ func (e *OrgTeam) Update(c *dto.OrgTeamUpdateReq, p *actions.DataPermission) err
if
db
.
RowsAffected
==
0
{
return
errors
.
New
(
"无权更新该数据"
)
}
c
.
Id
=
data
.
Id
return
nil
}
...
...
This diff is collapsed.
Click to expand it.
app/operate/service/org_team_user.go
View file @
6f7e1417
...
...
@@ -2,6 +2,7 @@ package service
import
(
"errors"
"strconv"
"github.com/go-admin-team/go-admin-core/sdk/service"
"gorm.io/gorm"
...
...
@@ -75,6 +76,8 @@ func (e *OrgTeamUser) Insert(c *dto.OrgTeamUserInsertReq) error {
e
.
Log
.
Errorf
(
"OrgTeamUserService Insert error:%s
\r\n
"
,
err
)
return
err
}
c
.
Id
=
data
.
Id
return
nil
}
...
...
@@ -85,9 +88,9 @@ func (e *OrgTeamUser) Update(c *dto.OrgTeamUserUpdateReq, p *actions.DataPermiss
e
.
Orm
.
Scopes
(
actions
.
Permission
(
data
.
TableName
(),
p
),
)
.
First
(
&
data
,
c
.
GetId
())
userId
:=
data
.
UserId
c
.
Generate
(
&
data
)
db
:=
e
.
Orm
.
Save
(
&
data
)
db
:=
e
.
Orm
.
Updates
(
&
data
)
if
db
.
Error
!=
nil
{
e
.
Log
.
Errorf
(
"OrgTeamUserService Save error:%s
\r\n
"
,
err
)
return
err
...
...
@@ -95,6 +98,8 @@ func (e *OrgTeamUser) Update(c *dto.OrgTeamUserUpdateReq, p *actions.DataPermiss
if
db
.
RowsAffected
==
0
{
return
errors
.
New
(
"无权更新该数据"
)
}
c
.
UserId
=
userId
return
nil
}
...
...
@@ -115,3 +120,19 @@ func (e *OrgTeamUser) Remove(d *dto.OrgTeamUserDeleteReq, p *actions.DataPermiss
}
return
nil
}
// GetPage 获取OrgTeamUser列表
func
(
e
*
OrgTeamUser
)
GetUserId
(
ids
[]
int
)
(
error
,
[]
int
)
{
list
:=
make
([]
models
.
OrgTeamUser
,
0
)
field
:=
"user_id"
e
.
Orm
.
Select
(
field
)
.
Where
(
"id IN(?)"
,
ids
)
.
Find
(
&
list
)
userIds
:=
make
([]
int
,
0
)
userid
:=
0
for
_
,
v
:=
range
list
{
userid
,
_
=
strconv
.
Atoi
(
v
.
UserId
)
userIds
=
append
(
userIds
,
userid
)
}
return
nil
,
userIds
}
This diff is collapsed.
Click to expand it.
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