Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
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
youjj
cloud-platform
Commits
1af1a795
Commit
1af1a795
authored
Oct 14, 2020
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加有效时间
parent
fcc50f11
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
AppUserDTO.java
...m/github/wxiaoqi/security/admin/feign/dto/AppUserDTO.java
+5
-0
AppUserController.java
...github/wxiaoqi/security/admin/rest/AppUserController.java
+1
-0
No files found.
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/dto/AppUserDTO.java
View file @
1af1a795
...
@@ -105,6 +105,11 @@ public class AppUserDTO {
...
@@ -105,6 +105,11 @@ public class AppUserDTO {
private
Integer
parentPositionTempId
;
private
Integer
parentPositionTempId
;
//用户分公司id
//用户分公司id
private
Integer
parentCompanyId
;
private
Integer
parentCompanyId
;
/**
* 有效期;0代表永久
*/
@ApiModelProperty
(
value
=
"有效期;0代表永久"
)
private
Long
validTime
;
public
String
obtainRealname
()
{
public
String
obtainRealname
()
{
if
(
StrUtil
.
isBlank
(
getRealname
()))
{
if
(
StrUtil
.
isBlank
(
getRealname
()))
{
...
...
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java
View file @
1af1a795
...
@@ -159,6 +159,7 @@ public class AppUserController extends CommonBaseController{
...
@@ -159,6 +159,7 @@ public class AppUserController extends CommonBaseController{
userDTO
.
setPayCount
(
orderFeign
.
baseOrderCount
(
SYS_TRUE
,
"4,5,6,-1"
,
null
,
userid
).
getData
());
userDTO
.
setPayCount
(
orderFeign
.
baseOrderCount
(
SYS_TRUE
,
"4,5,6,-1"
,
null
,
userid
).
getData
());
Integer
level
=
memberVo
.
getMemberLevel
();
Integer
level
=
memberVo
.
getMemberLevel
();
BaseUserMemberLevel
memberLevel
=
userMemberLevelBiz
.
getLevel
(
level
);
BaseUserMemberLevel
memberLevel
=
userMemberLevelBiz
.
getLevel
(
level
);
if
(
memberLevel
!=
null
){
if
(
memberLevel
!=
null
){
String
icon
=
memberLevel
.
getIcon
();
String
icon
=
memberLevel
.
getIcon
();
userDTO
.
setIcon
(
icon
);
userDTO
.
setIcon
(
icon
);
...
...
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