|
|
@@ -15,6 +15,7 @@ import javax.annotation.Resource;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* 客户档案表(UserArchives)表服务实现类
|
|
|
@@ -51,7 +52,11 @@ public class UserArchivesServiceImpl extends BaseMybatisDao< UserArchivesMapper>
|
|
|
UserArchivesDetails user = customerService.selectUserByUid(id);
|
|
|
UserArchives userArchives = queryByUid(id);
|
|
|
List<OrganizationContactBook> customerContacts = customerService.findCustomerContacts(id);
|
|
|
- if (!customerContacts.isEmpty())user.setContactList(customerContacts);
|
|
|
+ if (!customerContacts.isEmpty()){
|
|
|
+ List<OrganizationContactBook> collect = customerContacts.stream()
|
|
|
+ .filter(e -> e.getMajor() == 1).collect(Collectors.toList());
|
|
|
+ user.setContactList(collect);
|
|
|
+ }
|
|
|
BeanUtils.copyProperties(userArchives, user);
|
|
|
return user;
|
|
|
}
|