From 3ab3e6fcae40f39a5c63a59eb637bde5b4fbb6bc Mon Sep 17 00:00:00 2001
From: itcast <hello@itcast.cn>
Date: Sun, 13 Mar 2022 11:47:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=BA=93=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3-?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TenantBasicManagementController.java      |  4 ++--
 .../pms/ocp/mapper/OcpTenantGroupMapper.java  |  2 +-
 .../service/TenantBasicManagementService.java |  4 ++--
 .../TenantBasicManagementServiceImpl.java     | 24 ++++++++-----------
 src/main/resources/mapper/OcpGroup.xml        | 11 ++++++---
 5 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java
index b8a07e3..4b7e96d 100644
--- a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java
+++ b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java
@@ -81,8 +81,8 @@ public class TenantBasicManagementController {
     }
     @ApiOperation("应用树层级")
     @GetMapping("/tenantBaseTreeOther")
-    public ResponseVO<List<OcpTenantGroup>> tenantBaseTreeOther(String tenantGroupCode,String code) {
-        List<OcpTenantGroup> ocpApiGroups = tenantBasicManagementService.tenantBaseTreeOther(tenantGroupCode,code);
+        public ResponseVO<List<OcpTenantGroup>> tenantBaseTreeOther(@RequestParam(required = false)String tenantGroupCode,@RequestParam(required = false)String tenantGroupCompanyCode) {
+        List<OcpTenantGroup> ocpApiGroups = tenantBasicManagementService.tenantBaseTreeOther(tenantGroupCode,tenantGroupCompanyCode);
         return ResponseVO.ok(ocpApiGroups);
     }
 
diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java
index 0fb9988..ca3a609 100644
--- a/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java
+++ b/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java
@@ -12,7 +12,7 @@ import java.util.List;
 
 @Mapper
 public interface OcpTenantGroupMapper extends BaseMapper<OcpTenantGroup> {
-    List<OcpTenantGroup> tenantBaseTreeOther(@Param("tenantGroupCode") String tenantGroupCode,@Param("tenantGroupCode") String p);
+    List<OcpTenantGroup> tenantBaseTreeOther(@Param("tenantGroupCode") String tenantGroupCode,@Param("tenantGroupCompanyCode") String tenantGroupCompanyCode);
 
     List<OcpTenantBaseDto> selectPageLists(TenantDto tenantDto);
 }
diff --git a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java
index 9ecebf3..419cc3a 100644
--- a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java
+++ b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java
@@ -56,10 +56,10 @@ public interface TenantBasicManagementService extends IService<OcpTenantBase> {
     /**
      * 应用树层级
      * @param tenantGroupCode
-     * @param tenantGroupPcode
+     * @param tenantGroupCompanyCode
      * @return
      */
-    List<OcpTenantGroup> tenantBaseTreeOther(String tenantGroupCode,String tenantGroupPcode);
+    List<OcpTenantGroup> tenantBaseTreeOther(String tenantGroupCode,String tenantGroupCompanyCode);
 
     /**
      * 应用列表
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 e6404a5..7d0211e 100644
--- a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java
@@ -207,12 +207,12 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
      * 应用树层级
      *
      * @param tenantGroupCode
-     * @param tenantGroupPcode
+     * @param tenantGroupCompanyCode
      * @return
      */
     @Override
-    public List<OcpTenantGroup> tenantBaseTreeOther(String tenantGroupCode, String tenantGroupPcode) {
-        List<OcpTenantGroup> ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCode, tenantGroupPcode);
+    public List<OcpTenantGroup> tenantBaseTreeOther(String tenantGroupCode, String tenantGroupCompanyCode) {
+        List<OcpTenantGroup> ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCode, tenantGroupCompanyCode);
         return ocpTenantGroups;
     }
 
@@ -227,8 +227,8 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
         if (tenantDto.getPageNum() == null || tenantDto.getPageSize() == null) {
             return ResponseVO.error("分页参数不能为空");
         }
-        tenantGroup.add(tenantDto.getTenantCode());
-        setGroupIdValue(tenantDto.getTenantGroupCompanyCode(), tenantDto.getTenantCode());
+        tenantGroup.add(tenantDto.getTenantGroupCode());
+        setGroupIdValue(tenantDto.getTenantGroupCompanyCode(), tenantDto.getTenantGroupCode());
         PageHelper.startPage(tenantDto.getPageNum(), tenantDto.getPageSize());
 
         List<OcpTenantBaseDto> ocpTenantBaseDto = ocpTenantGroupMapper.selectPageLists(tenantDto);
@@ -236,17 +236,13 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
         PageInfo<OcpTenantBaseDto> pageInfo = new PageInfo<>(ocpTenantBaseDto);
         return ResponseVO.ok(pageInfo);
 
-//        List<OcpApiBaseVo> ocpApiBaseVos = ocpApiGroupMapper.selectPageLists(apiBaseReq);
-//        tenantGroupCode.clear();
-//        PageInfo<OcpApiBaseVo> pageInfo = new PageInfo<>(ocpApiBaseVos);
-//        return ResponseVO.ok(pageInfo);
     }
 
-    public void setGroupIdValue(String apiGroupCompanyCode, String code) {
-        List<String> codes = getIdsByPIdPub(apiGroupCompanyCode, code);
+    public void setGroupIdValue(String tenantGroupCompanyCode, String tenantGroupCode) {
+        List<String> codes = getIdsByPIdPub(tenantGroupCompanyCode, tenantGroupCode);
         if (codes.size() > 0) {
             for (String cod : codes) {
-                setGroupIdValue(apiGroupCompanyCode, cod);
+                setGroupIdValue(tenantGroupCompanyCode, cod);
                 tenantGroup.add(cod);
             }
             ;
@@ -254,8 +250,8 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
 
     }
 
-    public List<String> getIdsByPIdPub(String apiGroupCompanyCode, String code) {
-        List<OcpTenantGroup> ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(apiGroupCompanyCode, code);
+    public List<String> getIdsByPIdPub(String tenantGroupCompanyCode, String tenantGroupCode) {
+        List<OcpTenantGroup> ocpTenantGroups = ocpTenantGroupMapper.tenantBaseTreeOther(tenantGroupCompanyCode, tenantGroupCode);
         return ocpTenantGroups.stream().map(OcpTenantGroup::getTenantGroupCode).collect(Collectors.toList());
     }
 
diff --git a/src/main/resources/mapper/OcpGroup.xml b/src/main/resources/mapper/OcpGroup.xml
index c74bfda..43a5bac 100644
--- a/src/main/resources/mapper/OcpGroup.xml
+++ b/src/main/resources/mapper/OcpGroup.xml
@@ -19,9 +19,14 @@
     <select id="tenantBaseTreeOther" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
         select tenant_group_code,tenant_group_name,tenant_group_pcode,tenant_group_level from ocp_tenant_group where
         is_delete = 0
-
-        <if test="p !=null and p!=''">
-            and tenant_group_pcode=#{p}
+        <if test="tenantGroupCode == null">
+            and  tenant_group_pcode is null
+        </if>
+        <if test="tenantGroupCompanyCode !=null and tenantGroupCompanyCode!=''">
+                and tenant_group_company_code=#{tenantGroupCompanyCode}
+        </if>
+        <if test="tenantGroupCode !=null and tenantGroupCode!=''">
+            and tenant_group_pcode=#{tenantGroupCode}
         </if>
     </select>
 
-- 
2.26.0