|
|
@@ -428,16 +428,16 @@ public class CompanyRelImportController extends BaseController
|
|
|
}else {
|
|
|
//查询企业名称是否已经存在
|
|
|
LambdaQueryWrapper<SysCompany> companyLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
- //企业名称
|
|
|
- companyLambdaQueryWrapper.eq(SysCompany::getScyName,scyName);
|
|
|
+ //企业名称或统一代码已存在
|
|
|
+ companyLambdaQueryWrapper.and(f->f.eq(SysCompany::getScyName, scyName).or().eq(SysCompany::getScySocialCode, scySocialCode));
|
|
|
//除删除状态
|
|
|
companyLambdaQueryWrapper.ne(SysCompany::getScyStatus,"99");
|
|
|
List<SysCompany> companyListist = iSysCompanyService.findSysCompanys(companyLambdaQueryWrapper);
|
|
|
if(companyListist.size() > 0){
|
|
|
userNameList += scyName+",";
|
|
|
failureNum++;
|
|
|
- failureMsg.append("<br/>第" + (i+1) + "行数据导入失败,企业名称已存在，不可关联此企业");
|
|
|
- log.error("新增" + scyName + "的链属失败，企业名称已存在，不可关联此企业");
|
|
|
+ failureMsg.append("<br/>第" + (i+1) + "行数据导入失败,企业名称与统一代码不匹配，不可关联此企业");
|
|
|
+ log.error("新增" + scyName + "的链属失败，企业名称与统一代码不匹配，不可关联此企业");
|
|
|
continue;
|
|
|
}
|
|
|
LambdaQueryWrapper<SysCompanySpare> spareLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
sqg