|
|
@@ -196,8 +196,8 @@ public class HlwSubcontractorAccountFlowController extends JeecgController<HlwSu
|
|
|
//选择多个如果选择的付款企业和收款服务商有不同的则返回错误提示
|
|
|
if (i < idsList.size() - 1) {
|
|
|
HlwSubcontractorAccountFlow hlwSubcontractorAccountFlow3 = hlwSubcontractorAccountFlowService.getHlwSubcontractorAccountFlowById(idsList.get(i + 1));
|
|
|
- if (hlwSubcontractorAccountFlow2.getSubcontractorId().equals(hlwSubcontractorAccountFlow3.getSubcontractorId()) ||
|
|
|
- hlwSubcontractorAccountFlow2.getIsThroughPlatform().equals(hlwSubcontractorAccountFlow3.getIsThroughPlatform())) {
|
|
|
+ if (!hlwSubcontractorAccountFlow2.getSubcontractorId().equals(hlwSubcontractorAccountFlow3.getSubcontractorId()) ||
|
|
|
+ !hlwSubcontractorAccountFlow2.getIsThroughPlatform().equals(hlwSubcontractorAccountFlow3.getIsThroughPlatform())) {
|
|
|
return Result.error("请选择付款企业、收款服务商都相同的数据");
|
|
|
}
|
|
|
}
|
|
|
@@ -205,9 +205,9 @@ public class HlwSubcontractorAccountFlowController extends JeecgController<HlwSu
|
|
|
//选择多个如果选择的付款企业和收款服务商有不同的则返回错误提示
|
|
|
if (i < idsList.size() - 1) {
|
|
|
HlwSubcontractorAccountFlow hlwSubcontractorAccountFlow3 = hlwSubcontractorAccountFlowService.getHlwSubcontractorAccountFlowById(idsList.get(i + 1));
|
|
|
- if (hlwSubcontractorAccountFlow2.getCompanyId().equals(hlwSubcontractorAccountFlow3.getCompanyId()) ||
|
|
|
- hlwSubcontractorAccountFlow2.getSubcontractorId().equals(hlwSubcontractorAccountFlow3.getSubcontractorId()) ||
|
|
|
- hlwSubcontractorAccountFlow2.getIsThroughPlatform().equals(hlwSubcontractorAccountFlow3.getIsThroughPlatform())) {
|
|
|
+ if (!hlwSubcontractorAccountFlow2.getCompanyId().equals(hlwSubcontractorAccountFlow3.getCompanyId()) ||
|
|
|
+ !hlwSubcontractorAccountFlow2.getSubcontractorId().equals(hlwSubcontractorAccountFlow3.getSubcontractorId()) ||
|
|
|
+ !hlwSubcontractorAccountFlow2.getIsThroughPlatform().equals(hlwSubcontractorAccountFlow3.getIsThroughPlatform())) {
|
|
|
return Result.error("请选择付款企业、收款服务商都相同的数据");
|
|
|
}
|
|
|
}
|