|
@@ -119,13 +119,14 @@ public class CompanyServiceImpl implements CompanyService {
|
|
PcCompanyExample companyExp = new PcCompanyExample();
|
|
PcCompanyExample companyExp = new PcCompanyExample();
|
|
switch (result){
|
|
switch (result){
|
|
case 1:
|
|
case 1:
|
|
- companyExp.or().andCompanyNameEqualTo(data.getCompanyName());
|
|
|
|
|
|
+ companyExp = companyExp1;
|
|
break;
|
|
break;
|
|
case 2:
|
|
case 2:
|
|
- companyExp.or().andCompanyCodeEqualTo(data.getCompanyCode());
|
|
|
|
|
|
+ companyExp = companyExp2;
|
|
break;
|
|
break;
|
|
case 3:
|
|
case 3:
|
|
- companyExp.or().andCompanyNameEqualTo(data.getCompanyName()).andCompanyCodeEqualTo(data.getCompanyCode());
|
|
|
|
|
|
+ companyExp.or().andCompanyNameEqualTo(data.getCompanyName()).andCompanyIDNotEqualTo(data.getCompanyID());
|
|
|
|
+ companyExp.or().andCompanyCodeEqualTo(data.getCompanyCode()).andCompanyIDNotEqualTo(data.getCompanyID());
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
var repeatData = pcCompanyMapper.selectByExample(companyExp).stream().findFirst().orElse(null);
|
|
var repeatData = pcCompanyMapper.selectByExample(companyExp).stream().findFirst().orElse(null);
|