diff --git a/src/main/java/com/pms/ocp/mapper/TenantMapper.java b/src/main/java/com/pms/ocp/mapper/TenantMapper.java index 70d1e171ef2ad7d5a453ff18a83e33276998729f..4fe78eb686c326e737e9ed7d4fb9b46a56982589 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 { List 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 a21427023aa407358338b529cd1529d8841017e7..abd2e53bb19fce39147296b6c914b3dfea5325e1 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 { */ Page 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 6255b3f00f103a7f272f8786bbc1316c77e19aa7..bf529ff2fdd3fc0e657414325f2729f79ff57670 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 @Override public Page getselects(String tenantGroupCode, String tenantGroupCompanyCode, int currentPage, int pageSize, String keyword,String lev) { LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); + OcpTenantGroup ocpTenantGroup = tenantMapper.selectGroupCode(tenantGroupCode); + Page page = new Page<>(currentPage, pageSize); if (StringUtils.isBlank(keyword)) { if("".equals(lev) || "1".equals(lev)) { LambdaQueryWrapper eq = qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode); - tenantMapper.selectPage(page, eq); + tenantMapper.selectPage(page, eq); }else if ("2".equals(lev) || "3".equals(lev)) { LambdaQueryWrapper 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 .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 e7583ac8a9fd2f7cc30ea5b8d104a5f76f858afe..ff70fd840b57684d0fe0600f91e0016c10c67454 100644 --- a/src/main/resources/mapper/OcpTenantGroup.xml +++ b/src/main/resources/mapper/OcpTenantGroup.xml @@ -34,6 +34,11 @@ + + +