diff --git a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java
index 3b2472466e298fdecc3092132b3ea76749b87863..22cdc6b4f2f6deeaf9a8f2d2b1c392f95fc73338 100644
--- a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java
+++ b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java
@@ -42,8 +42,8 @@ public class OcpApiTreeController {
 
     @PostMapping("/instertree")
     @ApiOperation("服务树分类--新增")
-    public ResponseVO inseter(@RequestBody OcpApiGroupDtos ocpApiGroupDtos){
-        boolean flag = service.insertTree(ocpApiGroupDtos);
+    public ResponseVO inseter(@RequestBody OcpApiGroup ocpApiGroup){
+        boolean flag = service.insertTree(ocpApiGroup);
         if (flag){
             return ResponseVO.ok();
         }
diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java
index c4ad7ec474960356cfb82dc467645cd53a7914aa..3e6f5e7bdb86946232905d833c50c436a5036d37 100644
--- a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java
+++ b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java
@@ -32,5 +32,8 @@ public interface OcpApiTreeMapper extends BaseMapper<OcpApiGroup> {
     List<OcpApiGroup> selectThreeApiGroupsList(Long apiGroupPromotionType, String apiGroupCode);
 
 
-  List<OcpApiGroup> selectList(Long apiGroupPromotionType, String apiGroupCode,Long apiGroupLevel);
+  List<OcpApiGroup> selectLists(Long apiGroupPromotionType, String apiGroupCode,Long apiGroupLevel);
+
+//code重复问题
+  List<OcpApiGroup> selectGroupCode();
 }
diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java b/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java
index f2b40d6c69b21511c661ab88862f1c57106316d1..632463f5ba94a392c4a2b1261642cafd7c382cf9 100644
--- a/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java
+++ b/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java
@@ -16,6 +16,7 @@ import java.util.List;
 @TableName("ocp_api_group")
 @ApiModel("服务分类表")
 public class OcpApiGroup {
+
   @TableId(type = IdType.ASSIGN_ID)
   @ApiModelProperty("主键ID")
   private String objId;
diff --git a/src/main/java/com/pms/ocp/service/OcpApiTreeService.java b/src/main/java/com/pms/ocp/service/OcpApiTreeService.java
index 7e3d79e0e5344a959e972870e8733a605040db03..0859ee146a36d4e17307cc0ead04d9d5ab2befab 100644
--- a/src/main/java/com/pms/ocp/service/OcpApiTreeService.java
+++ b/src/main/java/com/pms/ocp/service/OcpApiTreeService.java
@@ -21,7 +21,7 @@ public interface OcpApiTreeService extends IService<OcpApiGroup> {
     /**
      * 新增服务分类
      */
-    boolean insertTree(OcpApiGroupDtos ocpApiGroupDtos);
+    boolean insertTree(OcpApiGroup ocpApiGroup);
 
 
       /*
diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java
index 3a1cb73796d44363a9389769b3796b0a190bed84..11a7e4b39798aa3ad1b9cb4ce574235707d3ddbd 100644
--- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java
@@ -62,30 +62,19 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
     /**
      * 新增服务分类
      *
-     * @param ocpApiGroupDtos
+     * @param
      */
     @Override
-    public boolean insertTree(OcpApiGroupDtos ocpApiGroupDtos) {
-
+    public boolean insertTree(OcpApiGroup ocpApiGroup) {
         Timestamp timestamp = new Timestamp(System.currentTimeMillis());
         String code = RandomStringUtils.getRandomString(6);
         boolean flag = true;
-        List<OcpApiGroup> ocpApiGroups = mapper.selectList(null);
-        for (OcpApiGroup ocpApiGroup : ocpApiGroups) {
-            if (ocpApiGroup.getApiGroupCode().equals(ocpApiGroupDtos.getApiGroupCode())) {
-                flag = false;
-                break;
-            }
-        }
-        if (flag == true) {
-            OcpApiGroup ocpApiGroup1 = new OcpApiGroup();
-            ocpApiGroup1.setObjId("");
-            ocpApiGroup1.setApiGroupMtime(timestamp);
-            ocpApiGroup1.setApiGroupCtime(timestamp);
-            BeanUtils.copyProperties(ocpApiGroupDtos, ocpApiGroup1);
-            ocpApiGroup1.setApiGroupCode(code);
-            mapper.insert(ocpApiGroup1);
-        }
+               ocpApiGroup.setObjId("");
+               ocpApiGroup.setApiGroupMtime(timestamp);
+               ocpApiGroup.setApiGroupCtime(timestamp);
+               ocpApiGroup.setApiGroupPcode(ocpApiGroup.getApiGroupCode());
+               ocpApiGroup.setApiGroupCode(code);
+               mapper.insert(ocpApiGroup);
         return flag;
 
     }
@@ -150,8 +139,11 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper,OcpApiGr
         if (StringUtils.isBlank(pageGroupDto.getApiGroupCode())){
             List<OcpApiGroup> ocpApiGroups = mapper.selectTwoApiGroups(pageGroupDto.getApiGroupPromotionType());
             pageInfo.setRecords(ocpApiGroups);
+            LambdaQueryWrapper<OcpApiGroup> lambdaQueryWrapper = new LambdaQueryWrapper();
+            lambdaQueryWrapper.eq(OcpApiGroup::getApiGroupPromotionType,pageGroupDto.getApiGroupPromotionType());
+            mapper.selectPage(pageInfo,lambdaQueryWrapper);
         }else if (!(StringUtils.isBlank(pageGroupDto.getApiGroupCode()))){
-            List<OcpApiGroup> ocpApiGroups = mapper.selectList(pageGroupDto.getApiGroupPromotionType(),pageGroupDto.getApiGroupCode(),pageGroupDto.getApiGroupLevel());
+            List<OcpApiGroup> ocpApiGroups = mapper.selectLists(pageGroupDto.getApiGroupPromotionType(),pageGroupDto.getApiGroupCode(),pageGroupDto.getApiGroupLevel());
             LambdaQueryWrapper<OcpApiGroup> lwq = new LambdaQueryWrapper<>();
             pageInfo.setRecords(ocpApiGroups);
             mapper.selectPage(pageInfo, lwq);
diff --git a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java
index 5301d1f0f4b5ec3e6b1e1cd268f9365d3b21b865..c07cbe8092799bf15bff17f41f0e4c0abe814814 100644
--- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java
@@ -86,13 +86,10 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
             ocpTenantGroup.setTenantGroupVersion("1.0");
         }
 
-        OcpTenantBase ocpTenantBase = new OcpTenantBase();
-        BeanUtils.copyProperties(tenanBaseDto,ocpTenantBase);
         if ("null".equals(tenanBaseDto.getTenantGroupCode())){
             group.setTenantGroupCode(randomString);
         }
         tenantMapper.insert(tenanBaseDto);
-        tenantBasicMapper.insert(ocpTenantBase);
         return falg;
     }
 
diff --git a/src/main/resources/mapper/OcpApiTreeMapper.xml b/src/main/resources/mapper/OcpApiTreeMapper.xml
index f2b742b93a95cd7f1400fd0bf86756d173e60779..272b0e2ef026c67d46e5af7d1a9fedfa691146d2 100644
--- a/src/main/resources/mapper/OcpApiTreeMapper.xml
+++ b/src/main/resources/mapper/OcpApiTreeMapper.xml
@@ -1,19 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.pms.ocp.mapper.OcpApiTreeMapper">
-<!--    一级树-->
+<!--    特一级树-->
     <select id="selectApiGroups" resultType="com.pms.ocp.model.entity.OcpApiGroup">
       SELECT * FROM (select *,ROW_NUMBER() over(partition by  api_group_promotion_type) as rn from ocp_api_group) as u where u.rn= 1;
     </select>
-<!--    二级树-->
+<!--    一级树-->
     <select id="selectTwoApiGroups" resultType="com.pms.ocp.model.entity.OcpApiGroup">
-       SELECT * FROM ocp_api_group WHERE api_group_promotion_type = #{apiGroupPromotionType};
+       SELECT * FROM ocp_api_group WHERE api_group_promotion_type = #{apiGroupPromotionType} and api_group_level = '1';
     </select>
-<!--三级-->
+<!--二级-->
     <select id="selectThreeApiGroupsList" resultType="com.pms.ocp.model.entity.OcpApiGroup">
  SELECT * FROM ocp_api_group WHERE api_group_promotion_type = #{apiGroupPromotionType} and api_group_pcode = #{apiGroupCode};
     </select>
+<!--服务树 -查询-->
+    <select id="selectLists" resultType="com.pms.ocp.model.entity.OcpApiGroup">
+ SELECT * FROM ocp_api_group WHERE api_group_promotion_type = #{apiGroupPromotionType} and api_group_pcode = #{apiGroupCode} and api_group_level = #{apiGroupLevel};
+    </select>
 
 
+<!--  code值重复问题  -->
+    <select id="selectGroupCode" resultType="com.pms.ocp.model.entity.OcpApiGroup">
+     SELECT api_group_code FROM ocp_api_group;
+    </select>
+
 
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/OcpTenantGroup.xml b/src/main/resources/mapper/OcpTenantGroup.xml
index 648f425279dd8a91ceea67d233f138eb8ba0d9d9..c0171773cd64fca368e7acf092faea5063b74227 100644
--- a/src/main/resources/mapper/OcpTenantGroup.xml
+++ b/src/main/resources/mapper/OcpTenantGroup.xml
@@ -25,6 +25,52 @@
     <select id="selectGroups" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
         SELECT * FROM ocp_tenant_group WHERE  tenant_group_company_code = #{tenantGroupCompanyCode} and tenant_group_level = '1' ;
     </select>
+    
+<!--    模糊查询-->
+    <select id="queryLike" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
+        select  * from ocp_tenant_group
+        <where>
+        <if test="keyword !=null and keyword != '' ">
+            and tenant_group_code like CONCAT('%', #{keyword}::text,'%')
+        </if>
+        <if test="keyword !=null and keyword != '' ">
+            and tenant_group_name  like CONCAT('%', #{keyword}::text,'%')
+        </if>
+        <if test="keyword !=null and keyword != '' ">
+            and tenant_group_company_code like CONCAT('%', #{keyword}::text,'%')
+        </if>
+        <if test="keyword !=null and keyword != '' ">
+            and tenant_group_pcode like CONCAT('%', #{keyword}::text,'%')
+        </if>
+        <if test="keyword !=null and keyword != '' ">
+            and tenant_type like CONCAT('%', #{keyword}::text,'%')
+        </if>
+        <if test="keyword !=null and keyword != '' ">
+            and tenant_group_version like CONCAT('%', #{keyword}::text,'%')
+        </if>
+        <if test="keyword !=null and keyword != '' ">
+            and tenant_group_order_no like CONCAT('%', #{keyword}::text,'%')
+        </if>
+        <if test="keyword !=null and keyword != '' ">
+            and tenant_group_user_id like CONCAT('%', #{keyword}::text,'%')
+        </if>
+        <if test="keyword !=null and keyword != '' ">
+            and tenant_group_user_name like CONCAT('%', #{keyword}::text,'%')
+        </if>
+        <if test="keyword !=null and keyword != '' ">
+            and tenant_group_ctime like CONCAT('%', #{keyword}::text,'%')
+        </if>
+        <if test="keyword !=null and keyword != '' ">
+            and  tenant_group_mtime like CONCAT('%', #{keyword}::text,'%')
+        </if>
+        <if test="keyword !=null and keyword != '' ">
+            and is_delete like CONCAT('%', #{keyword}::text,'%')
+        </if>
+        <if test="keyword !=null and keyword != '' ">
+            and tenant_group_level like CONCAT('%', #{keyword}::text,'%')
+        </if>
+        </where>
+    </select>
 
 
 </mapper>