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
51bcc697
Commit
51bcc697
authored
Jan 15, 2022
by
haoyanbin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
b3491d06
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
8 deletions
+7
-8
org_team_user.go
app/operate/apis/org_team_user.go
+1
-2
org_team_user.go
app/operate/service/org_team_user.go
+6
-6
No files found.
app/operate/apis/org_team_user.go
View file @
51bcc697
...
...
@@ -11,7 +11,6 @@ import (
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
_
"github.com/go-admin-team/go-admin-core/sdk/pkg/response"
"go-admin/app/operate/models"
"go-admin/app/operate/service"
"go-admin/app/operate/service/dto"
"go-admin/common/actions"
...
...
@@ -79,7 +78,7 @@ func (e OrgTeamUser) Get(c *gin.Context) {
e
.
Error
(
500
,
err
,
err
.
Error
())
return
}
var
object
models
.
OrgTeamUser
var
object
dto
.
OrgTeamUserGetReply
p
:=
actions
.
GetPermissionFromContext
(
c
)
err
=
s
.
Get
(
&
req
,
p
,
&
object
)
...
...
app/operate/service/org_team_user.go
View file @
51bcc697
...
...
@@ -45,15 +45,15 @@ func (e *OrgTeamUser) GetPage(c *dto.OrgTeamUserGetPageReq, p *actions.DataPermi
}
// Get 获取OrgTeamUser对象
func
(
e
*
OrgTeamUser
)
Get
(
d
*
dto
.
OrgTeamUserGetReq
,
p
*
actions
.
DataPermission
,
model
*
models
.
OrgTeamUser
)
error
{
field
:=
"o
c.club_name, ot
.team_id, ot.team_name, otu.name, otu.sex, otu.user_img, otu.sign_img, sr.role_id, sr.role_name, su.username, su.status"
func
(
e
*
OrgTeamUser
)
Get
(
d
*
dto
.
OrgTeamUserGetReq
,
p
*
actions
.
DataPermission
,
model
*
dto
.
OrgTeamUserGetReply
)
error
{
field
:=
"o
tu.id,oc.club_name, otu
.team_id, ot.team_name, otu.name, otu.sex, otu.user_img, otu.sign_img, sr.role_id, sr.role_name, su.username, su.status"
err
:=
e
.
Orm
.
Table
(
"org_team_user as otu"
)
.
Select
(
field
)
.
Joins
(
"org_team as ot on otu.team_id=ot.id"
)
.
Joins
(
"org_club as oc on otu.club_id=oc.id"
)
.
Joins
(
"
sys_user as su on otu.user_id=su.
id"
)
.
Joins
(
"sys_role as sr on su.role_id=sr.role_id"
)
.
Joins
(
"
left join
org_team as ot on otu.team_id=ot.id"
)
.
Joins
(
"
left join
org_club as oc on otu.club_id=oc.id"
)
.
Joins
(
"
left join sys_user as su on otu.user_id=su.user_
id"
)
.
Joins
(
"
left join
sys_role as sr on su.role_id=sr.role_id"
)
.
First
(
model
,
d
.
GetId
())
.
Error
if
err
!=
nil
&&
errors
.
Is
(
err
,
gorm
.
ErrRecordNotFound
)
{
err
=
errors
.
New
(
"查看对象不存在或无权查看"
)
...
...
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