链属新增企业列表

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

@@ -582,49 +582,30 @@ public class OwnCompanyRelController extends BaseController
     @Log(title = "所有企业列表", businessType = BusinessType.OTHER)
     @Transactional(rollbackFor = Exception.class)
     public R listAllCompany()throws Exception {
-        //结果集
-        List<Map> resultList = new ArrayList<>();
-        //链属企业list
-        List<Map> arrayList = new ArrayList();
         //获取当前操作员
         LoginUser user = tokenService.getLoginUser();
         String companyId = user.getSysUser().getCompanyId();
-        //查询出已经链属的企业
-        LambdaQueryWrapper<SysCompanyRel> sysCompanyRelLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        sysCompanyRelLambdaQueryWrapper.eq(SysCompanyRel::getScrLaunchCompanyId,companyId).or().eq(SysCompanyRel::getScrReceiveCompanyId,companyId);
-        sysCompanyRelLambdaQueryWrapper.eq(SysCompanyRel::getScrStatus,"01");
-        List<SysCompanyRel> sysCompanyRelList = iSysCompanyRelService.findSysCompanyRels(sysCompanyRelLambdaQueryWrapper);
-        for (SysCompanyRel sysCompanyRel : sysCompanyRelList){
-            Map map = new HashMap();
-            String company = "";
-            if(companyId.equals(sysCompanyRel.getScrLaunchCompanyId())){
-                company = sysCompanyRel.getScrReceiveCompanyId();
-            }else if(companyId.equals(sysCompanyRel.getScrReceiveCompanyId())){
-                company = sysCompanyRel.getScrLaunchCompanyId();
-            }
-            map.put("companyId",company);
-            arrayList.add(map);
-        }
+        //查询出已经链属的企业(当前企业为发起者)
+        LambdaQueryWrapper<SysCompanyRel> launchLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        launchLambdaQueryWrapper.eq(SysCompanyRel::getScrLaunchCompanyId,companyId);
+        launchLambdaQueryWrapper.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);
+        //合并
+        List<String> companyList = CommonUtil.getIdFromList(launchCompanyRelList, "scrReceiveCompanyId");
+        companyList.addAll(CommonUtil.getIdFromList(receiveCompanyRelList, "scrLaunchCompanyId"));
         //查询正常状态下的企业
         LambdaQueryWrapper<SysCompany> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SysCompany::getScyStatus,NORMAL_STATE);
         queryWrapper.eq(SysCompany::getScyType, CONFIRM_STATE).or().eq(SysCompany::getScyType, REFUSE_STATE);
+        queryWrapper.notIn(SysCompany::getScyId, companyList);
+        queryWrapper.ne(SysCompany::getScyId, companyId);
         List<SysCompany> list = iSysCompanyService.findSysCompanys(queryWrapper);
-        for (SysCompany sysCompany : list){
-            Map map = new HashMap();
-            //企业Id
-            map.put("scyId",sysCompany.getScyId());
-            //企业名称
-            map.put("scyName",sysCompany.getScyName());
-            //社会信用代码
-            map.put("scySocialCode",sysCompany.getScySocialCode());
-            for (Map arrayMap : arrayList){
-                if(!arrayMap.get("companyId").equals(sysCompany.getScyId())){
-                    resultList.add(map);
-                }
-            }
-        }
-        return R.ok(resultList);
+        return R.ok(list);
     }
 
     /**