|
@@ -149,11 +149,22 @@ public class BizCompanyServiceImpl extends ServiceImpl<BizCompanyMapper, BizCom
|
|
case "company":
|
|
case "company":
|
|
QueryWrapper<BizCompany> companyWrapper = new QueryWrapper<>();
|
|
QueryWrapper<BizCompany> companyWrapper = new QueryWrapper<>();
|
|
companyWrapper.eq("name", sourceName);
|
|
companyWrapper.eq("name", sourceName);
|
|
|
|
+ companyWrapper.eq("tenant_id", tenantId);
|
|
BizCompany sourceCompany = bizCompanyMapper.selectOne(companyWrapper);
|
|
BizCompany sourceCompany = bizCompanyMapper.selectOne(companyWrapper);
|
|
|
|
+ if(sourceCompany == null){
|
|
|
|
+ failureNum++;
|
|
|
|
+ failureMsg.append("<br/>").append(failureNum).append("、").append(company.getName()).append(":来源名称未填写");
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
company.setSourceId(sourceCompany.getId());
|
|
company.setSourceId(sourceCompany.getId());
|
|
break;
|
|
break;
|
|
case "employee":
|
|
case "employee":
|
|
SysUser sourceUser = sysUserMapper.selectUserByUserName(sourceName);
|
|
SysUser sourceUser = sysUserMapper.selectUserByUserName(sourceName);
|
|
|
|
+ if(sourceUser == null){
|
|
|
|
+ failureNum++;
|
|
|
|
+ failureMsg.append("<br/>").append(failureNum).append("、").append(company.getName()).append(":来源名称未填写");
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
company.setSourceId(sourceUser.getId());
|
|
company.setSourceId(sourceUser.getId());
|
|
break;
|
|
break;
|
|
case "channel":
|
|
case "channel":
|
|
@@ -161,6 +172,11 @@ public class BizCompanyServiceImpl extends ServiceImpl<BizCompanyMapper, BizCom
|
|
channelWrapper.eq("name", sourceName);
|
|
channelWrapper.eq("name", sourceName);
|
|
channelWrapper.eq("tenant_id", tenantId);
|
|
channelWrapper.eq("tenant_id", tenantId);
|
|
BizChannel sourceChannel = bizChannelMapper.selectOne(channelWrapper);
|
|
BizChannel sourceChannel = bizChannelMapper.selectOne(channelWrapper);
|
|
|
|
+ if(sourceChannel == null){
|
|
|
|
+ failureNum++;
|
|
|
|
+ failureMsg.append("<br/>").append(failureNum).append("、").append(company.getName()).append(":来源名称未填写");
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
company.setSourceId(sourceChannel.getId());
|
|
company.setSourceId(sourceChannel.getId());
|
|
break;
|
|
break;
|
|
default:
|
|
default:
|