Commit 6f4dc3ca authored by 徐州's avatar 徐州

修改判断逻辑

parent d02233ef
...@@ -3232,10 +3232,26 @@ public class CustomerController extends BaseController { ...@@ -3232,10 +3232,26 @@ public class CustomerController extends BaseController {
final List<String> gh = new ArrayList<>(ghPhones); final List<String> gh = new ArrayList<>(ghPhones);
final List<String> dp = new ArrayList<>(dpPhones); final List<String> dp = new ArrayList<>(dpPhones);
dpPhones = dpPhones.stream().filter(i-> sk.contains(i) || gh.contains(i)).map(i-> i+ "(多客户池)").collect(Collectors.toList()); dpPhones = dpPhones.stream().map(i-> {
skPhones = skPhones.stream().filter(i-> dp.contains(i) || gh.contains(i)).map(i-> i+ "(多客户池)").collect(Collectors.toList()); if(sk.contains(i) || gh.contains(i)) {
ghPhones = ghPhones.stream().filter(i-> sk.contains(i) || dp.contains(i)).map(i-> i+ "(多客户池)").collect(Collectors.toList()); return i+ "(多客户池)";
}
return i;
}).collect(Collectors.toList());
skPhones = skPhones.stream().map(i-> {
if(dp.contains(i) || gh.contains(i)) {
return i+ "(多客户池)";
}
return i;
}).collect(Collectors.toList());
ghPhones = ghPhones.stream().map(i-> {
if(dp.contains(i) || sk.contains(i)) {
return i+ "(多客户池)";
}
return i;
}).collect(Collectors.toList());
if(dpPhones != null) { if(dpPhones != null) {
StringBuilder dpSb = new StringBuilder(); StringBuilder dpSb = new StringBuilder();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment