Merge remote-tracking branch 'origin/master'

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

@@ -443,6 +443,16 @@ public class OwnCompanyRelController extends BaseController
 //                remoteSystemService.sendNotice(scyId, scrId,"","00","","01","0",longs);
             }
         } else {
+            //查询企业名称是否已经存在
+            LambdaQueryWrapper<SysCompany> queryWrapper = new LambdaQueryWrapper<>();
+            //企业名称
+            queryWrapper.eq(SysCompany::getScyName,scyName);
+            //除删除状态
+            queryWrapper.ne(SysCompany::getScyStatus,"99");
+            List<SysCompany> list = iSysCompanyService.findSysCompanys(queryWrapper);
+            if(list.size() > 0){
+                throw new Exception("不可关联本企业");
+            }
             //新增链属公司信息
             SysCompanySpare sysCompanySpare = new SysCompanySpare();
             sysCompanySpare.setScpId(scrId);
@@ -574,7 +584,6 @@ public class OwnCompanyRelController extends BaseController
      * 查询企业列表
      */
     @GetMapping("/listAllCompany")
-    @Log(title = "所有企业列表", businessType = BusinessType.PRINT)
     @Transactional(rollbackFor = Exception.class)
     public R listAllCompany()throws Exception {
         //获取当前操作员
@@ -583,16 +592,17 @@ public class OwnCompanyRelController extends BaseController
         //查询出已经链属的企业(当前企业为发起者)
         LambdaQueryWrapper<SysCompanyRel> launchLambdaQueryWrapper = new LambdaQueryWrapper<>();
         launchLambdaQueryWrapper.eq(SysCompanyRel::getScrLaunchCompanyId,companyId);
-        launchLambdaQueryWrapper.eq(SysCompanyRel::getScrStatus,"01").or().eq(SysCompanyRel::getScrStatus, "00");
+        launchLambdaQueryWrapper.and(i->i.eq(SysCompanyRel::getScrStatus,"01").or().eq(SysCompanyRel::getScrStatus,"00"));
         List<SysCompanyRel> launchCompanyRelList = iSysCompanyRelService.findSysCompanyRels(launchLambdaQueryWrapper);
         //查询出已经链属的企业(当前企业为接收者)
         LambdaQueryWrapper<SysCompanyRel> receiveLambdaQueryWrapper = new LambdaQueryWrapper<>();
         receiveLambdaQueryWrapper.eq(SysCompanyRel::getScrReceiveCompanyId,companyId);
-        receiveLambdaQueryWrapper.eq(SysCompanyRel::getScrStatus,"01").or().eq(SysCompanyRel::getScrStatus, "00");
-        List<SysCompanyRel> receiveCompanyRelList = iSysCompanyRelService.findSysCompanyRels(launchLambdaQueryWrapper);
+        receiveLambdaQueryWrapper.and(i->i.eq(SysCompanyRel::getScrStatus,"01").or().eq(SysCompanyRel::getScrStatus,"00"));
+        List<SysCompanyRel> receiveCompanyRelList = iSysCompanyRelService.findSysCompanyRels(receiveLambdaQueryWrapper);
         //合并
         List<String> companyList = CommonUtil.getIdFromList(launchCompanyRelList, "scrReceiveCompanyId");
         companyList.addAll(CommonUtil.getIdFromList(receiveCompanyRelList, "scrLaunchCompanyId"));
+        companyList.add(companyId);
         //查询正常状态下的企业
         LambdaQueryWrapper<SysCompany> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SysCompany::getScyStatus,NORMAL_STATE);
@@ -615,7 +625,13 @@ public class OwnCompanyRelController extends BaseController
         //获取当前操作员
         LoginUser user = tokenService.getLoginUser();
         String userId = String.valueOf(user.getSysUser().getUserId());
-        return R.ok(userId);
+        String companyId = user.getSysUser().getCompanyId();
+        SysCompany sysCompany = iSysCompanyService.getById(companyId);
+        String type = sysCompany.getScyType();
+        Map map = new HashMap();
+        map.put("userId", userId);
+        map.put("scyType", type);
+        return R.ok(map);
     }
 
 }