From a88b039cd21a47c1f6fd482348aaf06ad7ecc44d Mon Sep 17 00:00:00 2001
From: zhaochengming <18706295423@163.com>
Date: Tue, 22 Mar 2022 19:37:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8--=E6=96=B0=E5=A2=9E=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/pms/ocp/mapper/TenantMapper.java         | 4 ++++
 src/main/java/com/pms/ocp/service/TenantService.java       | 2 ++
 .../java/com/pms/ocp/service/impl/TenantServiceImpl.java   | 7 ++++++-
 src/main/resources/mapper/OcpTenantGroup.xml               | 5 +++++
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/pms/ocp/mapper/TenantMapper.java b/src/main/java/com/pms/ocp/mapper/TenantMapper.java
index 70d1e17..4fe78eb 100644
--- a/src/main/java/com/pms/ocp/mapper/TenantMapper.java
+++ b/src/main/java/com/pms/ocp/mapper/TenantMapper.java
@@ -38,5 +38,9 @@ public interface TenantMapper extends BaseMapper<OcpTenantGroup> {
 
     List<OcpTenantGroup> selectGroupsList(String tenantGroupCompanyCode,String tenantGroupName);
 
+    /**
+     * 根据code查询这条数据
+     */
+    OcpTenantGroup selectGroupCode(String tenantGroupCode);
 
 }
diff --git a/src/main/java/com/pms/ocp/service/TenantService.java b/src/main/java/com/pms/ocp/service/TenantService.java
index a214270..abd2e53 100644
--- a/src/main/java/com/pms/ocp/service/TenantService.java
+++ b/src/main/java/com/pms/ocp/service/TenantService.java
@@ -50,4 +50,6 @@ public interface TenantService  extends IService<OcpTenantGroup> {
      */
     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 6255b3f..bf529ff 100644
--- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java
+++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java
@@ -166,13 +166,16 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
     @Override
     public Page<OcpTenantGroup> getselects(String tenantGroupCode, String tenantGroupCompanyCode, int currentPage, int pageSize, String keyword,String lev) {
         LambdaQueryWrapper<OcpTenantGroup> qw = new LambdaQueryWrapper<>();
+        OcpTenantGroup ocpTenantGroup = tenantMapper.selectGroupCode(tenantGroupCode);
+
         Page<OcpTenantGroup> page = new Page<>(currentPage, pageSize);
         if (StringUtils.isBlank(keyword)) {
          if("".equals(lev) || "1".equals(lev)) {
              LambdaQueryWrapper<OcpTenantGroup> eq = qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode);
-              tenantMapper.selectPage(page, eq);
+             tenantMapper.selectPage(page, eq);
          }else if ("2".equals(lev) || "3".equals(lev)) {
                 LambdaQueryWrapper<OcpTenantGroup> eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)).eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode);
+
                 tenantMapper.selectPage(page, eq);
             }
         } else if (!(StringUtils.isBlank(keyword))) {
@@ -182,7 +185,9 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
                     .or().like(OcpTenantGroup::getTenantGroupUserName, keyword);
             tenantMapper.selectPage(page, ocpTenantGroupLambdaQueryWrapper);
         }
+
         return page;
+
     }
 }
 
diff --git a/src/main/resources/mapper/OcpTenantGroup.xml b/src/main/resources/mapper/OcpTenantGroup.xml
index e7583ac..ff70fd8 100644
--- a/src/main/resources/mapper/OcpTenantGroup.xml
+++ b/src/main/resources/mapper/OcpTenantGroup.xml
@@ -34,6 +34,11 @@
     </select>
 
 
+    <select id="selectGroupCode" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
+        SELECT * FROM ocp_tenant_group WHERE  tenant_group_code = #{tenantGroupCode};
+    </select>
+
+
 
 
 
-- 
2.26.0