diff --git a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java
index 5bdbf36f94e853f3f7b9e1e52c7b1b195254bf00..d7acbc5f997a323a4b20004c8af2ff0b0638a707 100644
--- a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java
+++ b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java
@@ -188,7 +188,6 @@ public class ApiBasicManagementController {
             return apiBasicManagementService.apiIssue(apiCodes);
 
         }
-
     }
 
     @ApiOperation("服务列表")
@@ -210,12 +209,4 @@ public class ApiBasicManagementController {
         List<OcpApiGroup> apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode,apiGroupCode,apiGroupPromotionType);
         return ResponseVO.ok(apiTreeGroupDtos);
     }
-
-
-//    @PostMapping("/apiTree")
-//    @ApiOperation("服务列表2")
-//    public ResponseVO queryTreeData(@RequestBody WholeLinkParamDto wholeLinkParamDto) {
-//        return apiBasicManagementService.queryApiTreeData(wholeLinkParamDto);
-//    }
-
 }
diff --git a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java
index 91e6c04a31b4326401ca7f602317a0462cad99f3..9f9fe395c322dfe60153a8aaa4c0658f58eca957 100644
--- a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java
+++ b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java
@@ -1,13 +1,16 @@
 package com.pms.ocp.controller;
 
+import com.baomidou.mybatisplus.extension.api.R;
 import com.github.pagehelper.PageInfo;
 import com.pms.ocp.model.dto.*;
 import com.pms.ocp.model.entity.OcpApiGroup;
 import com.pms.ocp.model.entity.OcpTenantGroup;
+import com.pms.ocp.model.vo.Menu;
 import com.pms.ocp.model.vo.OcpApiBaseVo;
 import com.pms.ocp.model.vo.ResponseVO;
 import com.pms.ocp.service.TenantBasicManagementService;
 import com.pms.ocp.service.TenantService;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
@@ -30,6 +33,7 @@ public class TenantBasicManagementController {
     @Autowired
     private TenantService tenantService;
 
+
     @ApiOperation("条件查询")
     @GetMapping("/queryOcpTenantBaseDto")
     public ResponseVO<List<OcpTenantBaseDto>> queryOcpTenantBaseDto(
@@ -89,19 +93,13 @@ public class TenantBasicManagementController {
     }
 
     @ApiOperation("应用列表")
-    @GetMapping("/tenantListQuery")
+        @GetMapping("/tenantListQuery")
     public ResponseVO<PageInfo<OcpTenantBaseDto>> tenantListQuery(HttpServletRequest request, TenantDto tenantDto) {
-
         return tenantBasicManagementService.getBaseByGroupCode(tenantDto);
     }
 
-    @ApiOperation("应用树层级2")
-    @GetMapping("/baseTreeOther")
-    public ResponseVO<List<GroupDto>> baseTreeOther(@RequestParam(required = false) String tenantGroupCode) {
-        List<GroupDto> list = tenantBasicManagementService.baseTreeOther(tenantGroupCode);
-        return ResponseVO.ok(list);
 
-    }
+
 
 
 }
diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java
index 7e9071bc209714fdcef296194bccd2e1617c1276..e9a7effbb2869c8a437bae1538c9f8dbf45f5e31 100644
--- a/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java
+++ b/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java
@@ -18,5 +18,5 @@ public interface OcpTenantGroupMapper extends BaseMapper<OcpTenantGroup> {
 
     List<OcpTenantBaseDto> selectPageLists(TenantDto tenantDto);
 
-    List<GroupDto> selectAll();
+
 }
diff --git a/src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java b/src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java
index 3fd56004a6e1c25a9717d6149d4d33116ee9516f..5bbf40c307670d3519d272836fd086f5b74f750c 100644
--- a/src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java
+++ b/src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java
@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pms.ocp.model.dto.GroupDto;
 import com.pms.ocp.model.dto.OcpTenantBaseDto;
 import com.pms.ocp.model.entity.OcpTenantBase;
+import com.pms.ocp.model.vo.CompanyVo;
+import com.pms.ocp.model.vo.TenantGroupVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -14,7 +16,9 @@ import java.util.List;
 public interface TenantBasicManagementMapper extends BaseMapper<OcpTenantBase> {
 
 
-   List<OcpTenantBaseDto> queryOcpTenantBaseDto(@Param("keyword") String keyword,@Param("tenantGroupCode") String tenantGroupCode, @Param("tenantUnit") String tenantUnit, @Param("startTime") Timestamp startTime, @Param("endTime") Timestamp endTime, @Param("tenantCode") String tenantCode, @Param("pageSize") Integer pageSize, @Param("pageNum") Integer pageNum);
+//   List<OcpTenantBaseDto> queryOcpTenantBaseDto(@Param("keyword") String keyword,@Param("tenantGroupCode") String tenantGroupCode, @Param("tenantUnit") String tenantUnit, @Param("startTime") Timestamp startTime, @Param("endTime") Timestamp endTime, @Param("tenantCode") String tenantCode, @Param("pageSize") Integer pageSize, @Param("pageNum") Integer pageNum);
 
     List<GroupDto> select(String tenantGroupCode);
+
+    List<OcpTenantBaseDto> queryOcpTenantBaseDto(String tenantGroupCode, String keyword, String tenantUnit, Timestamp startTime, Timestamp endTime, String tenantCode, Integer pageSize, Integer pageNum);
 }
diff --git a/src/main/java/com/pms/ocp/model/entity/PmsCompany.java b/src/main/java/com/pms/ocp/model/entity/PmsCompany.java
new file mode 100644
index 0000000000000000000000000000000000000000..6a288c1e84b3d14ccb31ff867fecb002d954d65a
--- /dev/null
+++ b/src/main/java/com/pms/ocp/model/entity/PmsCompany.java
@@ -0,0 +1,51 @@
+package com.pms.ocp.model.entity;
+
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 服务表(PmsZyApi)实体类
+ *
+ * @author wangsufu
+ * @since 2022-01-04 20:46:09
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("pms_company")
+@ApiModel(value = "PMS网省公司表", description = "PMS网省公司表")
+public class PmsCompany implements Serializable {
+    private static final long serialVersionUID = -79779908395545838L;
+
+    @ApiModelProperty(value = "id")
+    private Integer id;
+
+    @ApiModelProperty(value = "公司名称")
+    private String companyName;
+
+    @ApiModelProperty(value = "公司代码")
+    private String companyCode;
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    @ApiModelProperty(value = "公司名称简写")
+    private String companyShortName;
+
+    @ApiModelProperty(value = "公司层级")
+    private String companyLevel;
+
+    @ApiModelProperty(value = "公司排序")
+    private Integer companySort;
+
+
+}
+
diff --git a/src/main/java/com/pms/ocp/model/vo/CompanyTenantVo.java b/src/main/java/com/pms/ocp/model/vo/CompanyTenantVo.java
new file mode 100644
index 0000000000000000000000000000000000000000..6ecea36e4633700085b31dd299b9b7b8781c126b
--- /dev/null
+++ b/src/main/java/com/pms/ocp/model/vo/CompanyTenantVo.java
@@ -0,0 +1,20 @@
+package com.pms.ocp.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+@ApiModel(value = "网省公司Vo", description = "网省公司Vo")
+public class CompanyTenantVo {
+    @ApiModelProperty(value = "公司名称")
+    private String companyName;
+    @ApiModelProperty(value = "公司code")
+    private String companyCode;
+    @ApiModelProperty(value = "应用名称")
+    private String tenantName;
+    @ApiModelProperty(value = "应用code")
+    private String tenantCode;
+}
diff --git a/src/main/java/com/pms/ocp/model/vo/CompanyVo.java b/src/main/java/com/pms/ocp/model/vo/CompanyVo.java
new file mode 100644
index 0000000000000000000000000000000000000000..246b4084b1c9a79e716099e22b6611da48c750ec
--- /dev/null
+++ b/src/main/java/com/pms/ocp/model/vo/CompanyVo.java
@@ -0,0 +1,16 @@
+package com.pms.ocp.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+@AllArgsConstructor
+@ApiModel(value = "网省公司Vo", description = "网省公司Vo")
+public class CompanyVo  implements Serializable {
+    private String companyName;
+    private String companyCode;
+}
+
diff --git a/src/main/java/com/pms/ocp/model/vo/TenantGroupVo.java b/src/main/java/com/pms/ocp/model/vo/TenantGroupVo.java
new file mode 100644
index 0000000000000000000000000000000000000000..f1d21d23d5b4882140bae5e7c829d96f34534bfd
--- /dev/null
+++ b/src/main/java/com/pms/ocp/model/vo/TenantGroupVo.java
@@ -0,0 +1,15 @@
+package com.pms.ocp.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "网省公司Vo", description = "网省公司Vo")
+public class TenantGroupVo {
+    @ApiModelProperty(value = "应用组code")
+    private String tenantGroupCode;
+    @ApiModelProperty(value = "应用组名称")
+    private String tenantGroupName;
+
+}
diff --git a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java
index be3980d347bc293e6b3b35ce6560f312ab3a243d..c5f3883039b073fdd4a7b0a5af1d09823e66354e 100644
--- a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java
+++ b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java
@@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo;
 import com.pms.ocp.model.dto.GroupDto;
 import com.pms.ocp.model.dto.OcpTenantBaseDto;
 import com.pms.ocp.model.dto.TenantDto;
+import com.pms.ocp.model.dto.WholeLinkParamDto;
 import com.pms.ocp.model.entity.OcpApiGroup;
 import com.pms.ocp.model.entity.OcpTenantBase;
 import com.pms.ocp.model.entity.OcpTenantGroup;
@@ -68,12 +69,6 @@ public interface TenantBasicManagementService extends IService<OcpTenantBase> {
      * @return
      */
     ResponseVO<PageInfo<OcpTenantBaseDto>> getBaseByGroupCode(TenantDto tenantDto);
-    /**
-     * 应用树
-     * @param tenantGroupCode
-     * @return
-     */
-    List<GroupDto> baseTreeOther(String tenantGroupCode);
 
 
 
diff --git a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java
index ce232bbece32e02d91386bfebf4a7a6d0d475b4f..fdf6ac7cc708c849d9417fb4332a14f5cabdf189 100644
--- a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java
@@ -114,14 +114,6 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
     }
 
 
-//    public OcpApiBaseDto queryOcpApiBaseDto(String apiCode, String keyword, String apiUnits, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum) {
-//        //String[] split = apiUnits.split(",");
-////        List<String> list = Arrays.asList(split);
-//        pageSize = (pageSize - 1) * pageNum;
-//        OcpApiBaseDto ocpApiBaseDto = apiBasicManagementMapper.queryOcpApiBaseDto(keyword, apiUnits, startTime, endTime, apiCode, pageSize, pageNum);
-//        return ocpApiBaseDto;
-//    }
-
     /**
      * 导入添加到数据库
      *
diff --git a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java
index 77b9140239df728af880ef37d81e84f4da9125e6..58f903a73d3fe3aa59df98431ad28c9971d04712 100644
--- a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java
@@ -11,8 +11,12 @@ import com.pms.ocp.mapper.TenantBasicManagementMapper;
 import com.pms.ocp.model.dto.GroupDto;
 import com.pms.ocp.model.dto.OcpTenantBaseDto;
 import com.pms.ocp.model.dto.TenantDto;
+import com.pms.ocp.model.dto.WholeLinkParamDto;
 import com.pms.ocp.model.entity.*;
+import com.pms.ocp.model.vo.CompanyTenantVo;
+import com.pms.ocp.model.vo.CompanyVo;
 import com.pms.ocp.model.vo.ResponseVO;
+import com.pms.ocp.model.vo.TenantGroupVo;
 import com.pms.ocp.service.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -247,16 +251,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
      * @param tenantGroupCode
      * @return
      */
-    @Override
-    public List<GroupDto> baseTreeOther(String tenantGroupCode) {
-        List<GroupDto> group = null;
-        if (StringUtils.isBlank(tenantGroupCode)) {
-            group= ocpTenantGroupMapper.selectAll();
-        } else {
-           group= tenantBasicManagementMapper.select(tenantGroupCode);
-            }
-        return group;
-        }
+
 
 
 
diff --git a/src/main/resources/mapper/OcpGroup.xml b/src/main/resources/mapper/OcpGroup.xml
index a41b1d2f09692ff31f7e5bdb23e7d3d1ffc52557..ddaaa43527e31feee061c79e8358c60082e024ed 100644
--- a/src/main/resources/mapper/OcpGroup.xml
+++ b/src/main/resources/mapper/OcpGroup.xml
@@ -17,17 +17,19 @@
 
 
     <select id="tenantBaseTreeOther" resultType="com.pms.ocp.model.dto.GroupDto">
-        select
-        tenant_group_code,tenant_group_name,tenant_group_pcode ,tenant_group_level from ocp_tenant_group
-        where is_delete = 0
+        select otb.tenant_name,otb.tenant_code,
+        otg.tenant_group_code,otg.tenant_group_name,otg.tenant_group_pcode ,otg.tenant_group_level from ocp_tenant_group
+        otg
+      left  join ocp_tenant_base otb on otg.tenant_group_code=otb.tenant_group_code
+        where otg.is_delete = 0
         <if test="tenantGroupCode == null">
-            and tenant_group_pcode is null
+            and otg.tenant_group_pcode = ''
         </if>
         <if test="tenantGroupCompanyCode !=null and tenantGroupCompanyCode!=''">
-            and tenant_group_company_code=#{tenantGroupCompanyCode}
+            and otg.tenant_group_company_code=#{tenantGroupCompanyCode}
         </if>
         <if test="tenantGroupCode !=null and tenantGroupCode!=''">
-            and tenant_group_pcode=#{tenantGroupCode}
+            and otg.tenant_group_pcode=#{tenantGroupCode}
         </if>
 
 
@@ -55,9 +57,9 @@
         <!--        <if test="tenantCode !=null and tenantCode!=''">-->
         <!--            and otb.tenant_code = #{tenantCode}-->
         <!--        </if>-->
-        <if test="tenantGroupCode !=null and tenantGroupCode!=''">
-            and otb.tenant_group_code = #{tenantGroupCode}
-        </if>
+        <!--        <if test="tenantGroupCode !=null and tenantGroupCode!=''">-->
+        <!--            and otb.tenant_group_code = #{tenantGroupCode}-->
+        <!--        </if>-->
 
         <if test="startTime !=null  ">
             <![CDATA[
@@ -76,10 +78,5 @@
             and otb.tenant_code like CONCAT('%', #{keyword}::text,'%')
         </if>
     </select>
-    <select id="selectAll" resultType="com.pms.ocp.model.dto.GroupDto">
 
-        <!--    <select id="selectAll" resultType="java.util.List">-->
-        select tenant_group_name ,tenant_group_code from ocp_tenant_group where is_delete = 0
-        <!--    </select>-->
-    </select>
 </mapper>
diff --git a/src/main/resources/mapper/TenantBasicManagementMapper.xml b/src/main/resources/mapper/TenantBasicManagementMapper.xml
index 94eb3f330a05fa2eb867031f3a53703e7e27af2c..e42ae69a83311d5946201f2acd1cde768249ab02 100644
--- a/src/main/resources/mapper/TenantBasicManagementMapper.xml
+++ b/src/main/resources/mapper/TenantBasicManagementMapper.xml
@@ -3,16 +3,16 @@
 <mapper namespace="com.pms.ocp.mapper.TenantBasicManagementMapper">
     <resultMap id="ctbMap" type="com.pms.ocp.model.dto.OcpTenantBaseDto">
         <result property="objId" column="obj_id"/>
-        <result property="tenantCode" column="api_code"/>
-        <result property="tenantName" column="api_name"/>
-        <result property="tenantGroupName" column="cluster_name"/>
-        <result property="tenantUrl" column="space_name"/>
-        <result property="clusterName" column="api_unit"/>
-        <result property="spaceName" column="api_ctime"/>
-        <result property="deploymentName" column="api_state"/>
-        <result property="tenantZone" column="api_url"/>
-        <result property="tenantCtime" column="api_code"/>
-        <result property="tenantUnit" column="api_code"/>
+        <result property="tenantCode" column="tenant_code"/>
+        <result property="tenantName" column="tenant_name"/>
+        <result property="tenantGroupName" column="tenant_group_name"/>
+        <result property="tenantUrl" column="tenant_url"/>
+        <result property="clusterName" column="cluster_name"/>
+        <result property="spaceName" column="space_name"/>
+        <result property="deploymentName" column="deployment_name"/>
+        <result property="tenantZone" column="tenant_zone"/>
+        <result property="tenantCtime" column="tenant_ctime"/>
+        <result property="tenantUnit" column="tenant_unit"/>
     </resultMap>
 
     <select id="queryOcpTenantBaseDto" resultMap="ctbMap">
@@ -27,7 +27,7 @@
                 and otb.tenant_code=#{tenantCode}
             </if>
             <if test="tenantGroupCode!=null and tenantGroupCode!=''">
-                and otg.tenant_group_code=#{tenantGroupCode}
+                and otb.tenant_group_code=#{tenantGroupCode}
             </if>
 
             <if test="tenantCode!=null and tenantCode!=''">
@@ -62,4 +62,9 @@
         select tenant_name from ocp_tenant_base
        where tenant_group_code =#{tenantGroupCode}
     </select>
+
+
+
+
+
 </mapper>
\ No newline at end of file