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
a33e3f39
Commit
a33e3f39
authored
3 years ago
by
haoyanbin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user重复性
parent
2d39d872
master
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
2 deletions
+27
-2
org_team_user.go
app/operate/apis/org_team_user.go
+7
-0
org_user.go
app/operate/apis/org_user.go
+6
-0
org_team_user.go
app/operate/service/org_team_user.go
+14
-2
No files found.
app/operate/apis/org_team_user.go
View file @
a33e3f39
...
@@ -130,6 +130,13 @@ func (e OrgTeamUser) Insert(c *gin.Context) {
...
@@ -130,6 +130,13 @@ func (e OrgTeamUser) Insert(c *gin.Context) {
return
return
}
}
err
,
isSet
:=
s
.
IsBing
(
"0"
,
req
.
Username
)
if
isSet
>
1
{
e
.
Logger
.
Error
(
err
)
e
.
Error
(
121
,
err
,
"账户已存在"
)
return
}
sSysUser
:=
sService
.
SysUser
{}
sSysUser
:=
sService
.
SysUser
{}
reqSysUser
:=
sDto
.
SysUserInsertReq
{}
reqSysUser
:=
sDto
.
SysUserInsertReq
{}
e
.
MakeContext
(
c
)
.
MakeOrm
()
.
MakeService
(
&
sSysUser
.
Service
)
e
.
MakeContext
(
c
)
.
MakeOrm
()
.
MakeService
(
&
sSysUser
.
Service
)
...
...
This diff is collapsed.
Click to expand it.
app/operate/apis/org_user.go
View file @
a33e3f39
...
@@ -113,6 +113,12 @@ func (e OrgUser) Insert(c *gin.Context) {
...
@@ -113,6 +113,12 @@ func (e OrgUser) Insert(c *gin.Context) {
e
.
Error
(
500
,
err
,
err
.
Error
())
e
.
Error
(
500
,
err
,
err
.
Error
())
return
return
}
}
err
,
isSet
:=
s
.
IsBing
(
"0"
,
req
.
Username
)
if
isSet
>
1
{
e
.
Logger
.
Error
(
err
)
e
.
Error
(
121
,
err
,
"账户已存在"
)
return
}
sSysUser
:=
sService
.
SysUser
{}
sSysUser
:=
sService
.
SysUser
{}
reqSysUser
:=
sDto
.
SysUserInsertReq
{}
reqSysUser
:=
sDto
.
SysUserInsertReq
{}
...
...
This diff is collapsed.
Click to expand it.
app/operate/service/org_team_user.go
View file @
a33e3f39
...
@@ -5,12 +5,11 @@ import (
...
@@ -5,12 +5,11 @@ import (
"strconv"
"strconv"
"github.com/go-admin-team/go-admin-core/sdk/service"
"github.com/go-admin-team/go-admin-core/sdk/service"
"gorm.io/gorm"
"go-admin/app/operate/models"
"go-admin/app/operate/models"
"go-admin/app/operate/service/dto"
"go-admin/app/operate/service/dto"
"go-admin/common/actions"
"go-admin/common/actions"
cDto
"go-admin/common/dto"
cDto
"go-admin/common/dto"
"gorm.io/gorm"
)
)
type
OrgTeamUser
struct
{
type
OrgTeamUser
struct
{
...
@@ -122,6 +121,19 @@ func (e *OrgTeamUser) Remove(d *dto.OrgTeamUserDeleteReq, p *actions.DataPermiss
...
@@ -122,6 +121,19 @@ func (e *OrgTeamUser) Remove(d *dto.OrgTeamUserDeleteReq, p *actions.DataPermiss
return
nil
return
nil
}
}
func
(
e
*
OrgTeamUser
)
IsBing
(
userId
string
,
username
string
)
(
error
,
int64
)
{
var
err
error
var
i
int64
err
=
e
.
Orm
.
Table
(
"sys_user"
)
.
Where
(
"username = ?"
,
username
)
.
Scopes
(
cDto
.
SetWhereNE
(
""
,
"user_id"
,
userId
))
.
Count
(
&
i
)
.
Error
if
err
!=
nil
{
e
.
Log
.
Errorf
(
"db error: %s"
,
err
)
return
err
,
1
}
return
nil
,
i
}
// GetPage 获取OrgTeamUser列表
// GetPage 获取OrgTeamUser列表
func
(
e
*
OrgTeamUser
)
GetUserIds
(
ids
[]
int
)
(
error
,
[]
int
)
{
func
(
e
*
OrgTeamUser
)
GetUserIds
(
ids
[]
int
)
(
error
,
[]
int
)
{
list
:=
make
([]
models
.
OrgTeamUser
,
0
)
list
:=
make
([]
models
.
OrgTeamUser
,
0
)
...
...
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