|
|
@@ -1601,12 +1601,15 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
if (sysRelationPersonList.size() > 0) {
|
|
|
List<String> collect = sysRelationPersonList.stream().map(SysRelationPerson::getSuggestId).collect(Collectors.toList());
|
|
|
|
|
|
- if (collect.size() > 4) {
|
|
|
- List<String> collect1 = collect.stream().limit(4).collect(Collectors.toList());
|
|
|
- ids.addAll(collect1);
|
|
|
- } else {
|
|
|
+// if (collect.size() > 4) {
|
|
|
+// List<String> collect1 = collect.stream().limit(4).collect(Collectors.toList());
|
|
|
+// ids.addAll(collect1);
|
|
|
+// } else {
|
|
|
+// ids.addAll(collect);
|
|
|
+//
|
|
|
+// }
|
|
|
+ if (collect.size()>0) {
|
|
|
ids.addAll(collect);
|
|
|
-
|
|
|
}
|
|
|
|
|
|
}
|
|
|
@@ -1616,12 +1619,15 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
|
|
|
if (sysRelationList.size() > 0) {
|
|
|
|
|
|
List<String> collect1 = sysRelationList.stream().map(SysRelationPerson::getAgencyLeaderId).collect(Collectors.toList());
|
|
|
- if (collect1.size() > 4) {
|
|
|
- List<String> collect2 = collect1.stream().limit(4).collect(Collectors.toList());
|
|
|
- ids.addAll(collect2);
|
|
|
- } else {
|
|
|
+// if (collect1.size() > 4) {
|
|
|
+// List<String> collect2 = collect1.stream().limit(4).collect(Collectors.toList());
|
|
|
+// ids.addAll(collect2);
|
|
|
+// } else {
|
|
|
+// ids.addAll(collect1);
|
|
|
+//
|
|
|
+// }
|
|
|
+ if (collect1.size() >0) {
|
|
|
ids.addAll(collect1);
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
if (CollectionUtil.isNotEmpty(ids)) {
|