Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
browser-backend
Project
Project
Details
Activity
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
Administrator
browser-backend
Commits
4f41430f
Commit
4f41430f
authored
Mar 30, 2020
by
renjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
子用户bug
parent
e8fb276a
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
17 deletions
+12
-17
SubUsersRequestDto.java
.../edgec/browserbackend/account/dto/SubUsersRequestDto.java
+9
-16
AccountServiceImpl.java
...owserbackend/account/service/impl/AccountServiceImpl.java
+3
-0
ShopServiceImpl.java
.../browserbackend/browser/service/Impl/ShopServiceImpl.java
+0
-1
No files found.
src/main/java/com/edgec/browserbackend/account/dto/SubUsersRequestDto.java
View file @
4f41430f
...
@@ -13,9 +13,8 @@ import java.util.List;
...
@@ -13,9 +13,8 @@ import java.util.List;
public
class
SubUsersRequestDto
{
public
class
SubUsersRequestDto
{
private
int
amount
;
private
int
amount
;
private
String
password
;
private
String
password
;
private
int
permission
;
private
String
nickname
;
private
String
nickname
;
private
int
permisson
=
-
1
;
private
int
permiss
i
on
=
-
1
;
private
String
comment
;
private
String
comment
;
private
List
<
String
>
usernames
;
private
List
<
String
>
usernames
;
private
List
<
String
>
whiteList
;
private
List
<
String
>
whiteList
;
...
@@ -36,13 +35,6 @@ public class SubUsersRequestDto {
...
@@ -36,13 +35,6 @@ public class SubUsersRequestDto {
this
.
amount
=
amount
;
this
.
amount
=
amount
;
}
}
public
int
getPermission
()
{
return
permission
;
}
public
void
setPermission
(
int
permission
)
{
this
.
permission
=
permission
;
}
public
String
getNickname
()
{
public
String
getNickname
()
{
return
nickname
;
return
nickname
;
...
@@ -52,13 +44,6 @@ public class SubUsersRequestDto {
...
@@ -52,13 +44,6 @@ public class SubUsersRequestDto {
this
.
nickname
=
nickname
;
this
.
nickname
=
nickname
;
}
}
public
int
getPermisson
()
{
return
permisson
;
}
public
void
setPermisson
(
int
permisson
)
{
this
.
permisson
=
permisson
;
}
public
List
<
String
>
getUsernames
()
{
public
List
<
String
>
getUsernames
()
{
return
usernames
;
return
usernames
;
...
@@ -83,4 +68,12 @@ public class SubUsersRequestDto {
...
@@ -83,4 +68,12 @@ public class SubUsersRequestDto {
public
void
setWhiteList
(
List
<
String
>
whiteList
)
{
public
void
setWhiteList
(
List
<
String
>
whiteList
)
{
this
.
whiteList
=
whiteList
;
this
.
whiteList
=
whiteList
;
}
}
public
int
getPermission
()
{
return
permission
;
}
public
void
setPermission
(
int
permission
)
{
this
.
permission
=
permission
;
}
}
}
src/main/java/com/edgec/browserbackend/account/service/impl/AccountServiceImpl.java
View file @
4f41430f
...
@@ -785,6 +785,9 @@ public class AccountServiceImpl implements AccountService {
...
@@ -785,6 +785,9 @@ public class AccountServiceImpl implements AccountService {
// user.setPassword(subUsersRequestDto.getPassword());
// user.setPassword(subUsersRequestDto.getPassword());
userAuthService
.
resetUserPassword
(
user
);
userAuthService
.
resetUserPassword
(
user
);
}
}
log
.
error
(
subUsersRequestDto
.
getPermission
()
+
"!"
);
if
(
subUsersRequestDto
.
getNickname
()
!=
null
)
if
(
subUsersRequestDto
.
getNickname
()
!=
null
)
childAccount
.
setNickname
(
subUsersRequestDto
.
getNickname
());
childAccount
.
setNickname
(
subUsersRequestDto
.
getNickname
());
if
(
subUsersRequestDto
.
getPermission
()
!=
-
1
)
if
(
subUsersRequestDto
.
getPermission
()
!=
-
1
)
...
...
src/main/java/com/edgec/browserbackend/browser/service/Impl/ShopServiceImpl.java
View file @
4f41430f
...
@@ -196,7 +196,6 @@ public class ShopServiceImpl implements ShopService {
...
@@ -196,7 +196,6 @@ public class ShopServiceImpl implements ShopService {
if
(
shopId
==
null
)
{
if
(
shopId
==
null
)
{
throw
new
ClientRequestException
(
AccountErrorCode
.
OTHERS
);
throw
new
ClientRequestException
(
AccountErrorCode
.
OTHERS
);
}
}
logger
.
error
(
username
,
shopId
);
UserShop
userShop
=
userShopRepository
.
findByUsernameAndShopId
(
username
,
shopId
);
UserShop
userShop
=
userShopRepository
.
findByUsernameAndShopId
(
username
,
shopId
);
if
(
account
.
getPermission
()
<
4
||
userShop
==
null
)
{
if
(
account
.
getPermission
()
<
4
||
userShop
==
null
)
{
throw
new
ClientRequestException
(
AccountErrorCode
.
NOPERMISSION
);
throw
new
ClientRequestException
(
AccountErrorCode
.
NOPERMISSION
);
...
...
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