链属查询企业

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

@@ -374,6 +374,9 @@ public class OwnCompanyRelController extends BaseController
         String scrId = IdUtils.fastSimpleUUID();
         //链属企业Id
         String scyId = CommonUtil.objToString(map.get("scyId"));
+        if(scyId.equals(companyId)){
+            throw new Exception("不可同自己链属");
+        }
         if(CommonUtil.isNotEmpty(scyId)) {
             String finalScyId = scyId;
             //判断两者是否已经链属
@@ -451,7 +454,7 @@ public class OwnCompanyRelController extends BaseController
             queryWrapper.ne(SysCompany::getScyStatus,"99");
             List<SysCompany> list = iSysCompanyService.findSysCompanys(queryWrapper);
             if(list.size() > 0){
-                throw new Exception("不可关联本企业");
+                throw new Exception("企业名称已存在，不可关联本企业");
             }
             //新增链属公司信息
             SysCompanySpare sysCompanySpare = new SysCompanySpare();
@@ -606,11 +609,12 @@ public class OwnCompanyRelController extends BaseController
         //查询正常状态下的企业
         LambdaQueryWrapper<SysCompany> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SysCompany::getScyStatus,NORMAL_STATE);
-        queryWrapper.eq(SysCompany::getScyType, CONFIRM_STATE).or().eq(SysCompany::getScyType, REFUSE_STATE);
+        queryWrapper.and(i->i.eq(SysCompany::getScyType,CONFIRM_STATE).or().eq(SysCompany::getScyType,REFUSE_STATE));
         if(companyList.size() > 0) {
             queryWrapper.notIn(SysCompany::getScyId, companyList);
+        }else {
+            queryWrapper.ne(SysCompany::getScyId, companyId);
         }
-        queryWrapper.ne(SysCompany::getScyId, companyId);
         List<SysCompany> list = iSysCompanyService.findSysCompanys(queryWrapper);
         return R.ok(list);
     }