|
@@ -3971,12 +3971,31 @@ public class ReceivableServiceImpl extends ServiceImpl<ReceivableMapper, InsPlyI
|
|
|
if (StrUtil.isEmpty(search)) {
|
|
if (StrUtil.isEmpty(search)) {
|
|
|
return true;
|
|
return true;
|
|
|
}
|
|
}
|
|
|
|
|
+ List<String> companyIds = Arrays.asList(search.split(","));
|
|
|
|
|
+ HttpResult parentIds = null;
|
|
|
|
|
+ if (companyIds.size() <= 2){
|
|
|
|
|
+ parentIds = esmInsCompanyClient.getParentIds(companyIds);
|
|
|
|
|
+ }
|
|
|
if ("等于".equalsIgnoreCase(type) || "包含".equalsIgnoreCase(type)) {
|
|
if ("等于".equalsIgnoreCase(type) || "包含".equalsIgnoreCase(type)) {
|
|
|
- List<String> companyIds = Arrays.asList(search.split(","));
|
|
|
|
|
|
|
+ if (null != parentIds && parentIds.isSuccess()){
|
|
|
|
|
+ List<String> data = (List<String>) parentIds.getData();
|
|
|
|
|
+ if (CollUtil.isNotEmpty(data) && data.contains(insPlyIncome.getPartnerCompanyId())){
|
|
|
|
|
+ return true;
|
|
|
|
|
+ }else{
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
return companyIds.contains(insPlyIncome.getPartnerCompanyId());
|
|
return companyIds.contains(insPlyIncome.getPartnerCompanyId());
|
|
|
}
|
|
}
|
|
|
if ("不等于".equalsIgnoreCase(type) || "不包含".equalsIgnoreCase(type)) {
|
|
if ("不等于".equalsIgnoreCase(type) || "不包含".equalsIgnoreCase(type)) {
|
|
|
- List<String> companyIds = Arrays.asList(search.split(","));
|
|
|
|
|
|
|
+ if (null != parentIds && parentIds.isSuccess()){
|
|
|
|
|
+ List<String> data = (List<String>) parentIds.getData();
|
|
|
|
|
+ if (CollUtil.isNotEmpty(data) && !data.contains(insPlyIncome.getPartnerCompanyId())){
|
|
|
|
|
+ return true;
|
|
|
|
|
+ }else{
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
return !companyIds.contains(insPlyIncome.getPartnerCompanyId());
|
|
return !companyIds.contains(insPlyIncome.getPartnerCompanyId());
|
|
|
}
|
|
}
|
|
|
return true;
|
|
return true;
|