From 25b1f0010bf832a4c18da29b7e7bef44c31ced0c Mon Sep 17 00:00:00 2001 From: zhaochengming <18706295423@163.com> Date: Tue, 22 Mar 2022 14:52:34 +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=A0=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocp/controller/OcpTenantController.java | 2 +- .../pms/ocp/model/entity/OcpTenantGroup.java | 20 +++++++++++++++++++ .../com/pms/ocp/service/TenantService.java | 2 +- .../ocp/service/impl/TenantServiceImpl.java | 14 ++++++------- .../resources/mapper/OcpApiTreeMapper.xml | 2 +- 5 files changed, 29 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/pms/ocp/controller/OcpTenantController.java b/src/main/java/com/pms/ocp/controller/OcpTenantController.java index 650b296..73f5956 100644 --- a/src/main/java/com/pms/ocp/controller/OcpTenantController.java +++ b/src/main/java/com/pms/ocp/controller/OcpTenantController.java @@ -36,7 +36,7 @@ public class OcpTenantController { @GetMapping("/tenantOnetree") @ApiModelProperty("应用树分类") private List getTenantTree(OcpTenantGroup ocpTenantGroup) { - List tree= tenantService.getTree(ocpTenantGroup.getTenantGroupCompanyCode(),ocpTenantGroup.getTenantGroupCode()); + List tree= tenantService.getTree(ocpTenantGroup.getTenantGroupCompanyCode(),ocpTenantGroup.getTenantGroupCode(),ocpTenantGroup.getLev()); return tree; } @GetMapping("/tenantselect") diff --git a/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java index d23be91..f5c378f 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java @@ -113,6 +113,26 @@ public class OcpTenantGroup implements Serializable { @TableField(exist = false) private String classIfy; + @ApiModelProperty("分类等级") + @TableField(exist = false) + private String lev; + + public String getClassIfy() { + return classIfy; + } + + public void setClassIfy(String classIfy) { + this.classIfy = classIfy; + } + + public String getLev() { + return lev; + } + + public void setLev(String lev) { + this.lev = lev; + } + public static long getSerialVersionUID() { return serialVersionUID; } diff --git a/src/main/java/com/pms/ocp/service/TenantService.java b/src/main/java/com/pms/ocp/service/TenantService.java index fd1e814..9989c72 100644 --- a/src/main/java/com/pms/ocp/service/TenantService.java +++ b/src/main/java/com/pms/ocp/service/TenantService.java @@ -16,7 +16,7 @@ public interface TenantService extends IService { * 应用树分类管理 * @return */ - List getTree(String tenantGroupCode,String tenantGroupCompanyCode); + List getTree(String tenantGroupCode,String tenantGroupCompanyCode,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 7cf0f58..22832f4 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java @@ -1,9 +1,7 @@ package com.pms.ocp.service.impl; -import cn.afterturn.easypoi.cache.manager.IFileLoader; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pms.ocp.common.utils.RandomStringUtils; @@ -37,15 +35,15 @@ public class TenantServiceImpl extends ServiceImpl * @return */ @Override - public List getTree(String tenantGroupCompanyCode, String tenantGroupCode) { + public List getTree(String tenantGroupCompanyCode, String tenantGroupCode,String lev) { List ocpTenantGroupList = null; - if (StringUtils.isBlank(tenantGroupCode) && StringUtils.isBlank(tenantGroupCompanyCode)) { + if("".equals(lev) || "1".equals(lev)) { //顶级目录 ocpTenantGroupList = tenantMapper.oneTenantGroup(); - } else if (!(StringUtils.isBlank(tenantGroupCompanyCode)) && StringUtils.isBlank(tenantGroupCode)) { + } else if("".equals(lev) || "2".equals(lev)) { //二级目录 ocpTenantGroupList = tenantMapper.selectGroups(tenantGroupCompanyCode); - } else if (!(StringUtils.isBlank(tenantGroupCompanyCode)) && !(StringUtils.isBlank(tenantGroupCompanyCode))) { + } else if ("".equals(lev) || "3".equals(lev)) { //三级目录 ocpTenantGroupList = tenantMapper.selectTenantGroups(tenantGroupCode, tenantGroupCompanyCode); @@ -130,13 +128,13 @@ public class TenantServiceImpl extends ServiceImpl * @return */ @Override - public boolean gettenantDelete(OcpTenantGroup ocpTenantGroup) { + public boolean gettenantDelete(OcpTenantGroup ocpTenantGroup) { String objId = ocpTenantGroup.getObjId(); OcpTenantGroup ocpTenantGroup1 = tenantMapper.selectById(objId); boolean flag = true; LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper lambdaQueryWrapper = wrapper.eq(OcpTenantGroup::getTenantGroupPcode, ocpTenantGroup1.getTenantGroupCode()); - if (!(StringUtils.isBlank(lambdaQueryWrapper.toString()))){ + if (StringUtils.isBlank(lambdaQueryWrapper.toString())){ tenantMapper.deleteById(objId); }else { flag = false; diff --git a/src/main/resources/mapper/OcpApiTreeMapper.xml b/src/main/resources/mapper/OcpApiTreeMapper.xml index 508f03d..f634b45 100644 --- a/src/main/resources/mapper/OcpApiTreeMapper.xml +++ b/src/main/resources/mapper/OcpApiTreeMapper.xml @@ -15,7 +15,7 @@ -- 2.26.0