Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xyqb-user2
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
head_group
xyqb-user2
Commits
dd525621
Commit
dd525621
authored
Aug 03, 2017
by
Java—红包—徐 然
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
7a148c8b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
4 deletions
+21
-4
InnerController.java
...tgroup/xyqb/controller/external/user/InnerController.java
+21
-4
No files found.
src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java
View file @
dd525621
...
@@ -547,8 +547,12 @@ public class InnerController implements IBaseController {
...
@@ -547,8 +547,12 @@ public class InnerController implements IBaseController {
}
else
{
}
else
{
bean
.
setEducationEnum
(
extInfo
.
getEducationEnum
().
getName
());
bean
.
setEducationEnum
(
extInfo
.
getEducationEnum
().
getName
());
}
}
if
(
null
==
extInfo
.
getOccupationEnum
()){
bean
.
setOccupationEnum
(
cn
.
quantgroup
.
user
.
enums
.
OccupationEnum
.
UNKNOWN
.
getName
());
}
else
{
bean
.
setOccupationEnum
(
extInfo
.
getOccupationEnum
().
getName
());
}
bean
.
setOccupationEnum
(
extInfo
.
getOccupationEnum
().
getName
());
if
(
null
==
extInfo
.
getMarryStatus
()){
if
(
null
==
extInfo
.
getMarryStatus
()){
bean
.
setMarryStatus
(
cn
.
quantgroup
.
user
.
enums
.
MaritalStatus
.
UNKNOWN
.
getDescription
());
bean
.
setMarryStatus
(
cn
.
quantgroup
.
user
.
enums
.
MaritalStatus
.
UNKNOWN
.
getDescription
());
}
else
{
}
else
{
...
@@ -590,9 +594,22 @@ public class InnerController implements IBaseController {
...
@@ -590,9 +594,22 @@ public class InnerController implements IBaseController {
bean
.
setProvince
(
address
.
getProvince
());
bean
.
setProvince
(
address
.
getProvince
());
}
}
if
(
null
!=
extInfo
)
{
if
(
null
!=
extInfo
)
{
bean
.
setEducationEnum
(
extInfo
.
getEducationEnum
().
getName
());
if
(
null
==
extInfo
.
getEducationEnum
()){
bean
.
setOccupationEnum
(
extInfo
.
getOccupationEnum
().
getName
());
bean
.
setEducationEnum
(
cn
.
quantgroup
.
user
.
enums
.
EducationEnum
.
UNKNOWN
.
getName
());
bean
.
setMarryStatus
(
extInfo
.
getMarryStatus
().
getDescription
());
}
else
{
bean
.
setEducationEnum
(
extInfo
.
getEducationEnum
().
getName
());
}
if
(
null
==
extInfo
.
getOccupationEnum
()){
bean
.
setOccupationEnum
(
cn
.
quantgroup
.
user
.
enums
.
OccupationEnum
.
UNKNOWN
.
getName
());
}
else
{
bean
.
setOccupationEnum
(
extInfo
.
getOccupationEnum
().
getName
());
}
if
(
null
==
extInfo
.
getMarryStatus
()){
bean
.
setMarryStatus
(
cn
.
quantgroup
.
user
.
enums
.
MaritalStatus
.
UNKNOWN
.
getDescription
());
}
else
{
bean
.
setMarryStatus
(
extInfo
.
getMarryStatus
().
getDescription
());
}
}
}
if
(
org
.
apache
.
commons
.
collections
.
CollectionUtils
.
isNotEmpty
(
contacts
))
{
if
(
org
.
apache
.
commons
.
collections
.
CollectionUtils
.
isNotEmpty
(
contacts
))
{
List
<
XContactInfo
>
userContacts
=
contacts2ContactRets
(
contacts
);
List
<
XContactInfo
>
userContacts
=
contacts2ContactRets
(
contacts
);
...
...
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