Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
govdna
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
开发共享交流平台
govdna
Commits
d30db6af
Commit
d30db6af
authored
6 years ago
by
Administrator
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
did 改回deptId
parent
473b680f
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
9 deletions
+8
-9
AbstractController.java
.../govmade/modules/basic/controller/AbstractController.java
+1
-1
UserController.java
...com/govmade/modules/system/controller/UserController.java
+1
-1
UserEntity.java
...in/java/com/govmade/modules/system/entity/UserEntity.java
+5
-6
UserTest.java
src/test/java/test/UserTest.java
+1
-1
No files found.
src/main/java/com/govmade/modules/basic/controller/AbstractController.java
View file @
d30db6af
...
...
@@ -18,7 +18,7 @@ public abstract class AbstractController {
protected
UserEntity
getUser
()
{
//return (UserEntity) SecurityUtils.getSubject().getPrincipal();
UserEntity
ue
=
new
UserEntity
();
ue
.
setD
i
d
(
1L
);
ue
.
setD
eptI
d
(
1L
);
return
null
;
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/govmade/modules/system/controller/UserController.java
View file @
d30db6af
...
...
@@ -58,7 +58,7 @@ public class UserController extends AbstractController {
if
(
getUserId
()
!=
Constant
.
SUPER_ADMIN
)
{
params
.
put
(
"createBy"
,
getUserId
());
}
else
{
params
.
put
(
"deptId"
,
getUser
().
getD
i
d
());
// 部门管理员,查看本部门用户列表
params
.
put
(
"deptId"
,
getUser
().
getD
eptI
d
());
// 部门管理员,查看本部门用户列表
}
PageUtils
page
=
userService
.
queryPage
(
params
);
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/govmade/modules/system/entity/UserEntity.java
View file @
d30db6af
...
...
@@ -17,7 +17,7 @@ public class UserEntity extends BaseEntity<Long> {
private
static
final
long
serialVersionUID
=
1L
;
private
Long
d
i
d
;
// 部门ID
private
Long
d
eptI
d
;
// 部门ID
private
Long
roleId
;
// 角色ID
...
...
@@ -35,13 +35,12 @@ public class UserEntity extends BaseEntity<Long> {
private
Date
lastLoginTime
;
// 最后一次登录时间
public
Long
getDid
()
{
return
did
;
public
Long
getDeptId
()
{
return
deptId
;
}
public
void
setD
id
(
Long
di
d
)
{
this
.
d
id
=
di
d
;
public
void
setD
eptId
(
Long
deptI
d
)
{
this
.
d
eptId
=
deptI
d
;
}
public
Long
getRoleId
()
{
...
...
This diff is collapsed.
Click to expand it.
src/test/java/test/UserTest.java
View file @
d30db6af
...
...
@@ -19,7 +19,7 @@ public class UserTest {
public
void
contextLoads
()
{
UserEntity
user
=
new
UserEntity
();
user
.
setEmail
(
"qqq@qq.com"
);
user
.
setD
i
d
(
1L
);
user
.
setD
eptI
d
(
1L
);
user
.
setRoleId
(
1L
);
System
.
out
.
println
(
user
);
...
...
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