链属新增与导入问题

sc-service/src/main/java/com/huyi/service/rel/controller/CompanyRelImportController.java

@@ -479,7 +479,7 @@ public class CompanyRelImportController extends BaseController
                 LambdaQueryWrapper<SysCompanySpare> spareLambdaQueryWrapper = new LambdaQueryWrapper<>();
                 spareLambdaQueryWrapper.eq(SysCompanySpare::getScpCompanyId,hId);
                 spareLambdaQueryWrapper.ne(SysCompanySpare::getScpStatus,"99");
-                spareLambdaQueryWrapper.and(f->f.eq(SysCompanySpare::getScpName, scyName).or().eq(SysCompanySpare::getScpSocialCode, scySocialCode));
+                spareLambdaQueryWrapper.eq(SysCompanySpare::getScpSocialCode, scySocialCode);
                 List<SysCompanySpare> sysCompanySpareList = iSysCompanySpareService.findSysCompanySpares(spareLambdaQueryWrapper);
                 if(sysCompanySpareList.size() > 0){
                     String invite = sysCompanySpareList.get(0).getScpInvite();

sc-service/src/main/java/com/huyi/service/rel/controller/OwnCompanyRelController.java

@@ -548,20 +548,20 @@ public class OwnCompanyRelController extends BaseController
                 remoteSystemService.sendNotice(scyId, scrId,title,"01","03",null,"0",use.toString(),null,null,null);
             }
         } else {
-            //查询企业名称是否已经存在
+            //查询企业名称或企业名称是否已经存在
             LambdaQueryWrapper<SysCompany> queryWrapper = new LambdaQueryWrapper<>();
             //企业名称
-            queryWrapper.eq(SysCompany::getScyName,scyName);
+            queryWrapper.and(f->f.eq(SysCompany::getScyName, scyName).or().eq(SysCompany::getScySocialCode, scySocialCode));
             //除删除状态
             queryWrapper.ne(SysCompany::getScyStatus,"99");
             List<SysCompany> list = iSysCompanyService.findSysCompanys(queryWrapper);
             if(list.size() > 0){
-                throw new Exception("企业名称已存在，不可关联此企业");
+                throw new Exception("企业名称与统一代码不匹配，不可关联此企业");
             }
             LambdaQueryWrapper<SysCompanySpare> spareLambdaQueryWrapper = new LambdaQueryWrapper<>();
             spareLambdaQueryWrapper.eq(SysCompanySpare::getScpCompanyId,companyId);
             spareLambdaQueryWrapper.ne(SysCompanySpare::getScpStatus,"99");
-            spareLambdaQueryWrapper.and(i->i.eq(SysCompanySpare::getScpName, scyName).or().eq(SysCompanySpare::getScpSocialCode, scySocialCode));
+            spareLambdaQueryWrapper.eq(SysCompanySpare::getScpSocialCode, scySocialCode);
             List<SysCompanySpare> spareList = iSysCompanySpareService.findSysCompanySpares(spareLambdaQueryWrapper);
             if(spareList.size() > 0){
                 String invite = spareList.get(0).getScpInvite();