From 4e14c0d8ff2678f5ef4ee16b92a4a8872f309265 Mon Sep 17 00:00:00 2001
From: zhaochengming <18706295423@163.com>
Date: Wed, 16 Mar 2022 17:07:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=B5=E5=91=88=E6=98=8E=20--=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E6=9C=8D=E5=8A=A1=E6=A0=91=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/pms/ocp/controller/OcpTenantController.java   | 4 ++--
 src/main/java/com/pms/ocp/service/TenantService.java       | 2 +-
 .../java/com/pms/ocp/service/impl/TenantServiceImpl.java   | 7 +++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/pms/ocp/controller/OcpTenantController.java b/src/main/java/com/pms/ocp/controller/OcpTenantController.java
index e8b639f..650b296 100644
--- a/src/main/java/com/pms/ocp/controller/OcpTenantController.java
+++ b/src/main/java/com/pms/ocp/controller/OcpTenantController.java
@@ -41,8 +41,8 @@ public class OcpTenantController {
     }
     @GetMapping("/tenantselect")
     @ApiModelProperty("应用树分类--查询")
-    private ResponseVO<Page<OcpTenantGroup>> getselect(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String keyword){
-        Page<OcpTenantGroup> tree= tenantService.getselects(tenantGroupCode,tenantGroupCompanyCode,currentPage,pageSize,keyword);
+    private ResponseVO<Page<OcpTenantGroup>> getselect(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String keyword,String lev ){
+        Page<OcpTenantGroup> tree= tenantService.getselects(tenantGroupCode,tenantGroupCompanyCode,currentPage,pageSize,keyword,lev);
         return ResponseVO.ok(tree);
     }
 
diff --git a/src/main/java/com/pms/ocp/service/TenantService.java b/src/main/java/com/pms/ocp/service/TenantService.java
index 04ba99e..fd1e814 100644
--- a/src/main/java/com/pms/ocp/service/TenantService.java
+++ b/src/main/java/com/pms/ocp/service/TenantService.java
@@ -48,6 +48,6 @@ public interface TenantService  extends IService<OcpTenantGroup> {
      * @param tenantGroupCompanyCode
      * @return
      */
-    Page<OcpTenantGroup> getselects(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String text);
+    Page<OcpTenantGroup> getselects(String tenantGroupCode,String tenantGroupCompanyCode,int currentPage,int pageSize,String text,String lev);
 
 }
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 c866229..884d7df 100644
--- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java
@@ -168,18 +168,17 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
      * @return
      */
     @Override
-    public Page<OcpTenantGroup> getselects(String tenantGroupCode, String tenantGroupCompanyCode, int currentPage, int pageSize, String keyword) {
+    public Page<OcpTenantGroup> getselects(String tenantGroupCode, String tenantGroupCompanyCode, int currentPage, int pageSize, String keyword,String lev) {
         LambdaQueryWrapper<OcpTenantGroup> qw = new LambdaQueryWrapper<>();
 
         Page<OcpTenantGroup> page = new Page<>(currentPage, pageSize);
         if (StringUtils.isBlank(keyword)) {
-          if (!("".equals(tenantGroupCompanyCode)) && StringUtils.isBlank(tenantGroupCode)) {
+         if(lev.equals("1")) {
               List<OcpTenantGroup> ocpTenantGroupList = tenantMapper.selectTenantGroup(tenantGroupCompanyCode);
               qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode);
               page.setRecords(ocpTenantGroupList);
               tenantMapper.selectPage(page, qw);
-
-          }else  if (!("".equals(tenantGroupCompanyCode)) && !("".equals(tenantGroupCode))) {
+         }else if (lev.equals("2") || lev.equals("3")) {
                 LambdaQueryWrapper<OcpTenantGroup> eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)).eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode);
                 tenantMapper.selectPage(page, eq);
             }
-- 
2.26.0