From 3e7e5893c5c8565e6984060f6c0479ee10d75dc1 Mon Sep 17 00:00:00 2001
From: itcast <hello@itcast.cn>
Date: Sat, 12 Mar 2022 19:47:08 +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

---
 .../controller/TenantBasicManagementController.java  |  6 +++---
 .../com/pms/ocp/mapper/OcpTenantGroupMapper.java     |  2 +-
 .../ocp/service/TenantBasicManagementService.java    |  2 +-
 .../impl/TenantBasicManagementServiceImpl.java       | 12 ++++++------
 src/main/resources/mapper/OcpGroup.xml               |  4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java
index 7640060..b8a07e3 100644
--- a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java
+++ b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java
@@ -81,13 +81,13 @@ public class TenantBasicManagementController {
     }
     @ApiOperation("应用树层级")
     @GetMapping("/tenantBaseTreeOther")
-    public ResponseVO<List<OcpTenantGroup>> tenantBaseTreeOther(String tenantGroupCode, String tenantGroupPcode) {
-        List<OcpTenantGroup> ocpApiGroups = tenantBasicManagementService.tenantBaseTreeOther(tenantGroupCode,tenantGroupPcode);
+    public ResponseVO<List<OcpTenantGroup>> tenantBaseTreeOther(String tenantGroupCode,String code) {
+        List<OcpTenantGroup> ocpApiGroups = tenantBasicManagementService.tenantBaseTreeOther(tenantGroupCode,code);
         return ResponseVO.ok(ocpApiGroups);
     }
 
     @ApiOperation("应用列表")
-    @GetMapping("/tenantListQuery")
+        @GetMapping("/tenantListQuery")
     public ResponseVO<PageInfo<OcpTenantBaseDto>> tenantListQuery(HttpServletRequest request, TenantDto tenantDto) {
 
         return  tenantBasicManagementService.getBaseByGroupCode(tenantDto);
diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java
index 4d26a75..0fb9988 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("tenantGroupPcode") String tenantGroupPcode);
+    List<OcpTenantGroup> tenantBaseTreeOther(@Param("tenantGroupCode") String tenantGroupCode,@Param("tenantGroupCode") String p);
 
     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 ea6614d..9ecebf3 100644
--- a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java
+++ b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java
@@ -59,7 +59,7 @@ public interface TenantBasicManagementService extends IService<OcpTenantBase> {
      * @param tenantGroupPcode
      * @return
      */
-    List<OcpTenantGroup> tenantBaseTreeOther(String tenantGroupCode, String tenantGroupPcode);
+    List<OcpTenantGroup> tenantBaseTreeOther(String tenantGroupCode,String tenantGroupPcode);
 
     /**
      * 应用列表
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 6f09982..e6404a5 100644
--- a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java
@@ -43,7 +43,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
     @Autowired
     private OcpTenantGroupMapper ocpTenantGroupMapper;
 
-    List<String> tenantGroupCode = new ArrayList<>();
+    List<String> tenantGroup = new ArrayList<>();
 
     /**
      * 条件查询
@@ -225,14 +225,14 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
     @Override
     public ResponseVO<PageInfo<OcpTenantBaseDto>> getBaseByGroupCode(TenantDto tenantDto) {
         if (tenantDto.getPageNum() == null || tenantDto.getPageSize() == null) {
-            ResponseVO.error("分页参数不能为空");
+            return ResponseVO.error("分页参数不能为空");
         }
-        tenantGroupCode.add(tenantDto.getTenantCode());
+        tenantGroup.add(tenantDto.getTenantCode());
         setGroupIdValue(tenantDto.getTenantGroupCompanyCode(), tenantDto.getTenantCode());
         PageHelper.startPage(tenantDto.getPageNum(), tenantDto.getPageSize());
 
         List<OcpTenantBaseDto> ocpTenantBaseDto = ocpTenantGroupMapper.selectPageLists(tenantDto);
-        tenantGroupCode.clear();
+        tenantGroup.clear();
         PageInfo<OcpTenantBaseDto> pageInfo = new PageInfo<>(ocpTenantBaseDto);
         return ResponseVO.ok(pageInfo);
 
@@ -242,12 +242,12 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
 //        return ResponseVO.ok(pageInfo);
     }
 
-    private void setGroupIdValue(String apiGroupCompanyCode, String code) {
+    public void setGroupIdValue(String apiGroupCompanyCode, String code) {
         List<String> codes = getIdsByPIdPub(apiGroupCompanyCode, code);
         if (codes.size() > 0) {
             for (String cod : codes) {
                 setGroupIdValue(apiGroupCompanyCode, cod);
-                tenantGroupCode.add(cod);
+                tenantGroup.add(cod);
             }
             ;
         }
diff --git a/src/main/resources/mapper/OcpGroup.xml b/src/main/resources/mapper/OcpGroup.xml
index 334d22f..c74bfda 100644
--- a/src/main/resources/mapper/OcpGroup.xml
+++ b/src/main/resources/mapper/OcpGroup.xml
@@ -20,8 +20,8 @@
         select tenant_group_code,tenant_group_name,tenant_group_pcode,tenant_group_level from ocp_tenant_group where
         is_delete = 0
 
-        <if test="tenantGroupCode !=null and tenantGroupCode!=''">
-            and tenant_group_pcode=#{tenantGroupCode}
+        <if test="p !=null and p!=''">
+            and tenant_group_pcode=#{p}
         </if>
     </select>
 
-- 
2.26.0