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
e6d6363f
Commit
e6d6363f
authored
May 07, 2020
by
jiaorz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
会员类型添加
parent
7d32fbbd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
PublicController.java
.../github/wxiaoqi/security/admin/rest/PublicController.java
+1
-2
No files found.
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/PublicController.java
View file @
e6d6363f
...
...
@@ -13,13 +13,11 @@ import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.util.process.ResultCode
;
import
org.apache.commons.beanutils.BeanUtils
;
import
org.apache.commons.collections4.CollectionUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
import
java.lang.reflect.InvocationTargetException
;
import
java.util.ArrayList
;
import
java.util.Collections
;
import
java.util.List
;
/**
...
...
@@ -117,6 +115,7 @@ public class PublicController {
UserMemberVo
memberVo
=
userMemberBiz
.
getMemberInfoByUserId
(
userid
);
if
(
memberVo
!=
null
){
BeanUtils
.
copyProperties
(
userDTO
,
memberVo
);
userDTO
.
setMemberType
(
memberVo
.
getMemberType
());
}
}
AppUserPosition
userPosition
=
positionBiz
.
selectById
(
positionId
);
...
...
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