1.建筑公司树

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/BuildingController.java

@@ -4,6 +4,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -209,6 +210,18 @@ public class BuildingController extends AbstractBaseController {
     }
 
     /**
+     * 获取权限公司树
+     *
+     * @return list
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "根据登陆人获取公司树", notes = "根据登陆人获取公司树")
+    @GetMapping(value = "/companyTreeByUserAndType")
+    public List<OrgMenuDto> companyTreeByUserAndType() {
+        return buildService.companyTreeByUserAndType();
+    }
+
+    /**
      * 根据instanceId，获取建筑楼层信息
      *
      * @param instanceId

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IBuilldService.java

@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import com.yeejoin.amos.feign.morphic.model.ResourceDTO;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
 import com.yeejoin.equipmanage.common.entity.Building;
@@ -316,4 +317,6 @@ public interface IBuilldService extends IService<Building> {
      * @return List<BuildingTreeVo>
      */
     List<BuildingTreeVo> getBuildingTreeInOrgCode(String bizOrgCode);
+
+    List<OrgMenuDto> companyTreeByUserAndType();
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
+import com.yeejoin.amos.boot.biz.common.dto.OrgMenuDto;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.morphic.Morphic;
@@ -1236,6 +1237,11 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         }).collect(Collectors.toList());
     }
 
+    @Override
+    public List<OrgMenuDto> companyTreeByUserAndType() {
+        return jcsRemoteService.getCompanyDeptTreeWithAuth(authKey, "COMPANY");
+    }
+
     private List<BuildingTreeVo> getCompanyBuildingChildrenTree(String parentId, List<BuildingTreeVo> all) {
         return all.stream().filter(a -> parentId.equals(a.getParentId())).peek(a -> {
             a.setChildren(getCompanyBuildingChildrenTree(a.getId().toString(), all));