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
0ea76144
Commit
0ea76144
authored
Jan 24, 2022
by
haoyanbin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
user
parent
f2bf989b
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
34 additions
and
2 deletions
+34
-2
sys_user.go
app/admin/service/sys_user.go
+1
-1
org_user.go
app/operate/apis/org_user.go
+8
-1
org_user.go
app/operate/service/org_user.go
+14
-0
match.go
common/dto/match.go
+11
-0
No files found.
app/admin/service/sys_user.go
View file @
0ea76144
...
...
@@ -70,7 +70,7 @@ func (e *SysUser) Insert(c *dto.SysUserInsertReq) error {
return
err
}
if
i
>
0
{
err
:=
errors
.
New
(
"
用户名已存在!
"
)
err
:=
errors
.
New
(
"
账户已存在!请更换
"
)
e
.
Log
.
Errorf
(
"db error: %s"
,
err
)
return
err
}
...
...
app/operate/apis/org_user.go
View file @
0ea76144
...
...
@@ -138,7 +138,7 @@ func (e OrgUser) Insert(c *gin.Context) {
err
=
sSysUser
.
Insert
(
&
reqSysUser
)
if
err
!=
nil
{
e
.
Logger
.
Error
(
err
)
e
.
Error
(
500
,
err
,
err
.
Error
())
e
.
Error
(
111
,
err
,
err
.
Error
())
return
}
...
...
@@ -169,6 +169,13 @@ func (e OrgUser) Update(c *gin.Context) {
return
}
_
,
isBing
:=
s
.
IsBing
(
strconv
.
Itoa
(
req
.
UserId
),
req
.
Username
)
if
isBing
>
0
{
e
.
Error
(
111
,
err
,
"账户已存在!请更换"
)
return
}
req
.
SetUpdateBy
(
user
.
GetUserId
(
c
))
//数据权限检查
...
...
app/operate/service/org_user.go
View file @
0ea76144
...
...
@@ -113,3 +113,17 @@ func (e *OrgUser) Remove(d *dto.OrgUserDeleteReq, p *actions.DataPermission) err
}
return
nil
}
func
(
e
*
OrgUser
)
IsBing
(
userId
string
,
username
string
)
(
error
,
int64
)
{
var
err
error
var
data
models
.
SysUser
var
i
int64
err
=
e
.
Orm
.
Model
(
&
data
)
.
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
}
common/dto/match.go
View file @
0ea76144
...
...
@@ -70,6 +70,17 @@ func SetWhere(tableName string, fieldName string, fieldValue string) func(db *go
return
db
.
Where
(
tableName
+
"."
+
fieldName
+
" = ?"
,
fieldValue
)
}
}
func
SetWhereNE
(
tableName
string
,
fieldName
string
,
fieldValue
string
)
func
(
db
*
gorm
.
DB
)
*
gorm
.
DB
{
return
func
(
db
*
gorm
.
DB
)
*
gorm
.
DB
{
if
fieldValue
==
"0"
||
fieldValue
==
""
{
return
db
}
if
tableName
==
""
{
return
db
.
Where
(
fieldName
+
" != ?"
,
fieldValue
)
}
return
db
.
Where
(
tableName
+
"."
+
fieldName
+
" != ?"
,
fieldValue
)
}
}
func
SetWhereIn
(
tableName
string
,
fieldName
string
,
fieldValue
string
)
func
(
db
*
gorm
.
DB
)
*
gorm
.
DB
{
return
func
(
db
*
gorm
.
DB
)
*
gorm
.
DB
{
...
...
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