Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
so-operation-api
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
smart-operation
so-operation-api
Commits
38187b9d
Commit
38187b9d
authored
Jul 05, 2023
by
黄智
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整获取角色列表
parent
3cb81b59
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
src/controller/system_user.go
src/controller/system_user.go
+1
-1
src/service/system_user.go
src/service/system_user.go
+2
-2
No files found.
src/controller/system_user.go
View file @
38187b9d
...
@@ -35,7 +35,7 @@ func OrgUserRoles(c *gin.Context) {
...
@@ -35,7 +35,7 @@ func OrgUserRoles(c *gin.Context) {
return
return
}
}
svc
:=
service
.
User
{}
svc
:=
service
.
User
{}
result
,
err
:=
svc
.
OrgUserRoles
(
cast
.
ToInt
(
oid
)
)
result
,
err
:=
svc
.
OrgUserRoles
(
oid
)
if
err
!=
nil
{
if
err
!=
nil
{
SendJsonResponse
(
c
,
err
,
nil
)
SendJsonResponse
(
c
,
err
,
nil
)
return
return
...
...
src/service/system_user.go
View file @
38187b9d
...
@@ -64,14 +64,14 @@ func (o *User) OrgUserDetail(id int) (interface{}, error) {
...
@@ -64,14 +64,14 @@ func (o *User) OrgUserDetail(id int) (interface{}, error) {
}
}
// 组织添加用户时查询角色列表 查询非内置角色 + 平台运营者
// 组织添加用户时查询角色列表 查询非内置角色 + 平台运营者
func
(
o
*
User
)
OrgUserRoles
(
oid
int
)
(
interface
{},
error
)
{
func
(
o
*
User
)
OrgUserRoles
(
oid
string
)
(
interface
{},
error
)
{
db
,
err
:=
client
.
GetDbClient
()
db
,
err
:=
client
.
GetDbClient
()
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
resp
.
DbConnectError
.
ErrorDetail
(
err
)
return
nil
,
resp
.
DbConnectError
.
ErrorDetail
(
err
)
}
}
var
org
entity
.
SystemOrganization
var
org
entity
.
SystemOrganization
_
,
err
=
db
.
Table
(
"system_organization"
)
.
Where
(
"id = ?"
,
oid
)
.
Get
(
&
org
)
_
,
err
=
db
.
Table
(
"system_organization"
)
.
Where
(
"
organization_
id = ?"
,
oid
)
.
Get
(
&
org
)
if
err
!=
nil
{
if
err
!=
nil
{
conf
.
Logger
.
Error
(
"查询机构信息失败"
,
zap
.
Error
(
err
))
conf
.
Logger
.
Error
(
"查询机构信息失败"
,
zap
.
Error
(
err
))
return
nil
,
resp
.
DbSelectError
.
ErrorDetail
(
err
)
return
nil
,
resp
.
DbSelectError
.
ErrorDetail
(
err
)
...
...
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