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
02f25acf
Commit
02f25acf
authored
Jan 05, 2018
by
技术部-任文超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更正联系人列表名称
parent
ef04e566
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
InnerController.java
...tgroup/xyqb/controller/external/user/InnerController.java
+1
-1
UserAssociationModel.java
...n/java/cn/quantgroup/xyqb/model/UserAssociationModel.java
+5
-5
No files found.
src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java
View file @
02f25acf
...
...
@@ -644,7 +644,7 @@ public class InnerController implements IBaseController {
}
List
<
Contact
>
contacts
=
contactService
.
findByUserId
(
userDetail
.
getUserId
(),
true
);
if
(!
Objects
.
isNull
(
address
))
{
bean
.
putCont
r
actList
(
contacts
);
bean
.
putContactList
(
contacts
);
}
return
JsonResult
.
buildSuccessResult
(
""
,
bean
);
}
...
...
src/main/java/cn/quantgroup/xyqb/model/UserAssociationModel.java
View file @
02f25acf
...
...
@@ -30,7 +30,7 @@ public class UserAssociationModel implements Serializable {
private
Long
registerFrom
;
private
Long
merchantId
;
private
List
<
AddressModel
>
addressList
;
private
List
<
ContactModel
>
cont
r
actList
;
private
List
<
ContactModel
>
contactList
;
/**
* 填充地址模型列表
...
...
@@ -52,15 +52,15 @@ public class UserAssociationModel implements Serializable {
* 填充联系人模型列表
* @param entitylist
*/
public
void
putCont
r
actList
(
List
<
Contact
>
entitylist
){
public
void
putContactList
(
List
<
Contact
>
entitylist
){
if
(
Objects
.
isNull
(
entitylist
)){
return
;
}
if
(
Objects
.
isNull
(
this
.
cont
r
actList
)){
this
.
cont
r
actList
=
new
ArrayList
<
ContactModel
>(
entitylist
.
size
());
if
(
Objects
.
isNull
(
this
.
contactList
)){
this
.
contactList
=
new
ArrayList
<
ContactModel
>(
entitylist
.
size
());
}
for
(
Contact
entity
:
entitylist
)
{
this
.
cont
r
actList
.
add
(
ContactModel
.
entity2Model
(
entity
));
this
.
contactList
.
add
(
ContactModel
.
entity2Model
(
entity
));
}
}
}
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