From bc6bdf9acd161b0a2cb9cd5525333562431e6048 Mon Sep 17 00:00:00 2001 From: zhaochengming <18706295423@163.com> Date: Wed, 30 Mar 2022 22:23:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=80=BB=E9=83=A8--bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/ocp/mapper/OcpTenantBaseMapper.java | 3 +++ .../service/impl/OcpApiTreeServiceImpl.java | 3 ++- .../ocp/service/impl/TenantServiceImpl.java | 23 +++++++++++++++---- .../resources/mapper/OcpTenantBaseMapper.xml | 6 +++++ 4 files changed, 30 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java index 3f66a96..0062453 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java @@ -21,4 +21,7 @@ public interface OcpTenantBaseMapper extends BaseMapper { * @return */ int queryCount(String appCode); + + + List selcctCodeList(String ocpTenantGroup); } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java index 8c16447..eb53e37 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -43,6 +43,8 @@ public class OcpApiTreeServiceImpl extends ServiceImpl apiGroupStream1 = ocpApiGroupStream.filter(ocp -> ocp.getApiGroupName().equals(ocpApiGroup.getApiGroupName())); List ocpApiGroups1 = mapper.selectGroupName(ocpApiGroup.getApiGroupName()); OcpApiGroup ocpApi = new OcpApiGroup(); - if (ocpApiGroups1.size() == 0) { ocpApi.setApiGroupPromotionType(ocpApiGroup.getApiGroupPromotionType()); 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 4c07143..4939f96 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java @@ -6,9 +6,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageInfo; import com.pms.ocp.common.utils.RandomStringUtils; +import com.pms.ocp.mapper.OcpTenantBaseMapper; import com.pms.ocp.mapper.TenantBasicManagementMapper; import com.pms.ocp.mapper.TenantMapper; import com.pms.ocp.model.dto.*; +import com.pms.ocp.model.entity.OcpTenantBase; import com.pms.ocp.model.entity.OcpTenantGroup; import com.pms.ocp.service.TenantService; import org.apache.commons.lang3.StringUtils; @@ -32,6 +34,10 @@ public class TenantServiceImpl extends ServiceImpl @Autowired private TenantBasicManagementMapper tenantBasicMapper; + + @Autowired + private OcpTenantBaseMapper ocpTenantBaseMapper; + /** * 应用树分类管理 * @@ -64,6 +70,12 @@ public class TenantServiceImpl extends ServiceImpl @Override public OcpTenantGroup getTenanInster(TenanBaseDto tenanBaseDto) { boolean falg = true; + if (StringUtils.isNotBlank(tenanBaseDto.getTenantGroupCode())) { + List ocpTenantBases = ocpTenantBaseMapper.selcctCodeList(tenanBaseDto.getTenantGroupCode()); + if (ocpTenantBases.size() > 0) { + falg = false; + } + } OcpTenantGroup group = new OcpTenantGroup(); String randomString = RandomStringUtils.getRandomString(6); @@ -105,8 +117,11 @@ public class TenantServiceImpl extends ServiceImpl tenanBaseDto.setClassIfy(tenanBaseDto.getTenantGroupCode()); tenantMapper.insert(group); } + + return group; + } /** @@ -178,18 +193,18 @@ public class TenantServiceImpl extends ServiceImpl if (StringUtils.isBlank(keyword)) { if (StringUtils.isBlank(lev) || "1".equals(lev)) { - LambdaQueryWrapper eq = qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode); + LambdaQueryWrapper eq = qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode).orderByDesc(OcpTenantGroup::getTenantGroupMtime); 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); + .eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode).orderByDesc(OcpTenantGroup::getTenantGroupMtime); tenantMapper.selectPage(page, eq); } } else if (!(StringUtils.isBlank(keyword))) { LambdaQueryWrapper ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpTenantGroup::getTenantGroupCompanyCode, keyword)) .or().like(OcpTenantGroup::getTenantGroupName, keyword) .or().like(OcpTenantGroup::getTenantGroupPcode, keyword) - .or().like(OcpTenantGroup::getTenantGroupUserName, keyword); + .or().like(OcpTenantGroup::getTenantGroupUserName, keyword).orderByDesc(OcpTenantGroup::getTenantGroupMtime); tenantMapper.selectPage(page, ocpTenantGroupLambdaQueryWrapper); // OcpTenantGroup ocpTenantGroup1 = new OcpTenantGroup(); @@ -206,7 +221,7 @@ public class TenantServiceImpl extends ServiceImpl record.setClassIfy(ocpTenantGroup1.getTenantGroupName()); } } - if (StringUtils.isBlank(tenantGroupCode)){ + if (StringUtils.isBlank(tenantGroupCode)) { List records = page.getRecords(); for (OcpTenantGroup record : records) { record.setClassIfy(record.getTenantGroupName()); diff --git a/src/main/resources/mapper/OcpTenantBaseMapper.xml b/src/main/resources/mapper/OcpTenantBaseMapper.xml index 9d7566c..752b4ee 100644 --- a/src/main/resources/mapper/OcpTenantBaseMapper.xml +++ b/src/main/resources/mapper/OcpTenantBaseMapper.xml @@ -32,4 +32,10 @@ where tenant_code = #{appCode} + + \ No newline at end of file -- 2.26.0