From fb57cbe344912d45f1dff173a0b55955511c9365 Mon Sep 17 00:00:00 2001
From: diaoruifeng <18351522362@163.com>
Date: Sat, 12 Mar 2022 10:48:01 +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

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

diff --git a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java
index 9de9622..94789f6 100644
--- a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java
+++ b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java
@@ -192,13 +192,14 @@ public class ApiBasicManagementController {
             QueryResponseResult apiBaseList=  apiBasicManagementService.getBaseByGroupCode(ApiBaseReq);
       return apiBaseList;
     }
-    @ApiOperation("服务树一级")
-    @GetMapping("/apiBaseTree")
+    //@ApiOperation("服务树一级")
+    //@GetMapping("/apiBaseTree")
     public ResponseVO<List<OcpApiGroup>> apiBaseTree(String apiGroupCompanyCode) {
         List<OcpApiGroup> apiTreeGroupDtos = apiBasicManagementService.apiBaseTree(apiGroupCompanyCode);
         return ResponseVO.ok(apiTreeGroupDtos);
     }
-    @ApiOperation("服务树次级")
+
+    @ApiOperation("服务树层级")
     @GetMapping("/apiBaseTreeOther")
     public ResponseVO<List<OcpApiGroup>> apiBaseTreeOther(String apiGroupCompanyCode,String apiGroupPcode) {
         List<OcpApiGroup> apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode,apiGroupPcode);
diff --git a/src/main/resources/mapper/OcpApiGroupMapper.xml b/src/main/resources/mapper/OcpApiGroupMapper.xml
index 9ed38ed..28b72d6 100644
--- a/src/main/resources/mapper/OcpApiGroupMapper.xml
+++ b/src/main/resources/mapper/OcpApiGroupMapper.xml
@@ -19,7 +19,14 @@
     </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 api_group_pcode is null
+        select api_group_code,api_group_name,api_group_pcode,api_group_level from ocp_api_group where where is_delete = 0
+
+        <if test="apiGroupPcode == null">
+            and  api_group_pcode is null
+        </if>
+        <if test="apiGroupPcode!=null and apiGroupPcode!=''">
+            and api_group_pcode = #{apiGroupPcode}
+        </if>
         <if test="apiGroupCompanyCode!=null and apiGroupCompanyCode!=''">
             and api_group_company_code =#{apiGroupCompanyCode}
         </if>
-- 
2.26.0