From 8e36dc6f2735e20d51cb9c95b735410ee05e5c33 Mon Sep 17 00:00:00 2001
From: diaoruifeng <18351522362@163.com>
Date: Sat, 12 Mar 2022 14:00:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=88=97=E8=A1=A8=E6=A0=91?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocp/controller/ApiBasicManagementController.java | 12 ++++++------
 src/main/resources/mapper/OcpApiGroupMapper.xml      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java
index b4adf8d..986cb71 100644
--- a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java
+++ b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java
@@ -194,17 +194,17 @@ public class ApiBasicManagementController {
 
       return  apiBasicManagementService.getBaseByGroupCode(ApiBaseReq);
     }
-    //@ApiOperation("服务树一级")
-    //@GetMapping("/apiBaseTree")
-    public ResponseVO<List<OcpApiGroup>> apiBaseTree(String apiGroupCompanyCode) {
-        List<OcpApiGroup> apiTreeGroupDtos = apiBasicManagementService.apiBaseTree(apiGroupCompanyCode);
+    @ApiOperation("服务树一级")
+    @GetMapping("/apiBaseTree")
+    public ResponseVO<List<OcpApiGroup>> apiBaseTree(String apiGroupCompanyCode, Integer apiGroupPromotionType) {
+        List<OcpApiGroup> apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode,null,apiGroupPromotionType);
         return ResponseVO.ok(apiTreeGroupDtos);
     }
 
     @ApiOperation("服务树层级")
     @GetMapping("/apiBaseTreeOther")
-    public ResponseVO<List<OcpApiGroup>> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupPcode, Integer apiGroupPromotionType) {
-        List<OcpApiGroup> apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode,apiGroupPcode,apiGroupPromotionType);
+    public ResponseVO<List<OcpApiGroup>> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupCode, Integer apiGroupPromotionType) {
+        List<OcpApiGroup> apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode,apiGroupCode,apiGroupPromotionType);
         return ResponseVO.ok(apiTreeGroupDtos);
     }
 
diff --git a/src/main/resources/mapper/OcpApiGroupMapper.xml b/src/main/resources/mapper/OcpApiGroupMapper.xml
index 0b43e7f..e826579 100644
--- a/src/main/resources/mapper/OcpApiGroupMapper.xml
+++ b/src/main/resources/mapper/OcpApiGroupMapper.xml
@@ -19,7 +19,7 @@
     </resultMap>
 
     <select id="selectTreeList" resultType="com.pms.ocp.model.entity.OcpApiGroup">
-        select api_group_code,api_group_name,api_group_pcode,api_group_level from ocp_api_group where where is_delete = 0
+        select api_group_code,api_group_name,api_group_pcode,api_group_level from ocp_api_group where is_delete = 0
 
         <if test="apiGroupPcode == null">
             and  api_group_pcode is null
-- 
2.26.0