Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fangyeqing
/
xkl-interface
·
Commits
Go to a project
GitLab
Go to dashboard
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
zhaoyue
2017-04-04 20:38:44 +0800
Commit
6bbbd3923c6197d7ab7788e672acff76381f1d2f
2 parents
3e6e8530
e06333b8
Merge branch 'zhaoyue-dev4' into 'master'
MOD add role_id limit See merge request
!41
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
3 deletions
push.sh
src/main/java/com/xkl/domain/XklAdminEntity.java
src/main/java/com/xkl/service/LoginServiceImpl.java
push.sh
View file @
6bbbd39
...
...
@@ -2,7 +2,7 @@ git pull
git add --all src/main/java/
*
git add push.sh
git add pom.xml
git commit -m
"MOD
verify url
"
git commit -m
"MOD
add role_id limit
"
#git push origin master
git push origin zhaoyue-dev4
git status
...
...
src/main/java/com/xkl/domain/XklAdminEntity.java
View file @
6bbbd39
...
...
@@ -24,10 +24,13 @@ public class XklAdminEntity {
@Column
(
name
=
"pwd"
)
private
String
pwd
;
//
账号类型
//
角色
@Column
(
name
=
"type"
)
private
int
type
;
//账号类型
@Column
(
name
=
"role_id"
)
private
int
roleId
;
//公司id
@Column
(
name
=
"coid"
)
...
...
@@ -78,6 +81,14 @@ public class XklAdminEntity {
this
.
type
=
type
;
}
public
int
getRoleId
()
{
return
roleId
;
}
public
void
setRoleId
(
int
roleId
)
{
this
.
roleId
=
roleId
;
}
public
int
getCoid
()
{
return
coid
;
}
...
...
src/main/java/com/xkl/service/LoginServiceImpl.java
View file @
6bbbd39
...
...
@@ -43,7 +43,8 @@ public class LoginServiceImpl implements ILoginService{
@Override
public
XklAdminEntity
checkAdmin
(
String
username
,
String
password
)
{
XklAdminEntity
admin
=
adminRepository
.
findByAccountAndStatus
(
username
,
Constants
.
STATUS_OK
);
if
(
admin
==
null
){
// 只有 普通区域管理员5,直辖区域管理员6;普通区域操作员7,直辖区域操作员8 才能使用接口登录操作上传软件。
if
(
admin
==
null
||
admin
.
getRoleId
()
<
5
||
admin
.
getRoleId
()
>
8
)
{
return
null
;
}
else
{
String
salt
=
admin
.
getSalt
();
...
...
Please
register
or
login
to post a comment