Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gic-platform-auth
Overview
Overview
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
base_platform_enterprise
gic-platform-auth
Commits
0635a37e
Commit
0635a37e
authored
Dec 17, 2019
by
guojuxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gic个人资料接口添加字段:商户名称
parent
778dc76b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
1 deletions
+31
-1
UserController.java
...main/java/com/gic/auth/web/controller/UserController.java
+5
-1
LoginUserVO.java
...th-web/src/main/java/com/gic/auth/web/vo/LoginUserVO.java
+26
-0
No files found.
gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/UserController.java
View file @
0635a37e
package
com
.
gic
.
auth
.
web
.
controller
;
import
com.gic.enterprise.base.EnterpriseInfo
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.log4j.LogManager
;
import
org.apache.log4j.Logger
;
...
...
@@ -140,7 +141,10 @@ public class UserController {
public
RestResponse
getLoginUser
()
{
LoginUserVO
vo
=
EntityUtil
.
changeEntityNew
(
LoginUserVO
.
class
,
UserDetailUtils
.
getUserDetail
().
getUserInfo
());
//商户logo
vo
.
setLogo
(
UserDetailUtils
.
getUserDetail
().
getEnterpriseInfo
().
getLogo
());
EnterpriseInfo
enterpriseInfo
=
UserDetailUtils
.
getUserDetail
().
getEnterpriseInfo
();
vo
.
setLogo
(
enterpriseInfo
.
getLogo
());
vo
.
setEnterpriseName
(
enterpriseInfo
.
getEnterpriseName
());
vo
.
setCompanyName
(
enterpriseInfo
.
getCompanyName
());
return
RestResponse
.
success
(
vo
);
}
...
...
gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/LoginUserVO.java
View file @
0635a37e
...
...
@@ -33,6 +33,16 @@ public class LoginUserVO implements Serializable{
private
String
logo
;
/**
* 商户名称
*/
private
String
enterpriseName
;
/**
* 公司名称
*/
private
String
companyName
;
public
Integer
getUserId
()
{
return
userId
;
}
...
...
@@ -72,4 +82,20 @@ public class LoginUserVO implements Serializable{
public
void
setLogo
(
String
logo
)
{
this
.
logo
=
logo
;
}
public
String
getEnterpriseName
()
{
return
enterpriseName
;
}
public
void
setEnterpriseName
(
String
enterpriseName
)
{
this
.
enterpriseName
=
enterpriseName
;
}
public
String
getCompanyName
()
{
return
companyName
;
}
public
void
setCompanyName
(
String
companyName
)
{
this
.
companyName
=
companyName
;
}
}
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