From 7fcf053b410e6ec945cd13c47ab2dd2fa40ecd34 Mon Sep 17 00:00:00 2001 From: zhaochengming <18706295423@163.com> Date: Tue, 22 Mar 2022 15:42:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E6=A0=91--=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/ocp/controller/OcpTenantController.java | 2 +- .../com/pms/ocp/model/entity/OcpTenantGroup.java | 6 +++--- .../java/com/pms/ocp/service/TenantService.java | 2 +- .../pms/ocp/service/impl/TenantServiceImpl.java | 14 ++++++++------ src/main/resources/mapper/OcpTenantGroup.xml | 2 +- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/pms/ocp/controller/OcpTenantController.java b/src/main/java/com/pms/ocp/controller/OcpTenantController.java index 73f5956..7fc57d7 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(),ocpTenantGroup.getLev()); + List tree= tenantService.getTree(ocpTenantGroup.getTenantGroupCompanyCode(),ocpTenantGroup.getTenantGroupCode(),ocpTenantGroup.getLevel()); 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 f5c378f..19ac022 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java @@ -115,7 +115,7 @@ public class OcpTenantGroup implements Serializable { @ApiModelProperty("分类等级") @TableField(exist = false) - private String lev; + private String level; public String getClassIfy() { return classIfy; @@ -126,11 +126,11 @@ public class OcpTenantGroup implements Serializable { } public String getLev() { - return lev; + return level; } public void setLev(String lev) { - this.lev = lev; + this.level = level; } public static long getSerialVersionUID() { diff --git a/src/main/java/com/pms/ocp/service/TenantService.java b/src/main/java/com/pms/ocp/service/TenantService.java index 9989c72..a214270 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,String lev); + List getTree(String tenantGroupCode,String tenantGroupCompanyCode,String level); /** * 应用新增 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 22832f4..bb19c34 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java @@ -1,7 +1,9 @@ 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; @@ -35,15 +37,15 @@ public class TenantServiceImpl extends ServiceImpl * @return */ @Override - public List getTree(String tenantGroupCompanyCode, String tenantGroupCode,String lev) { + public List getTree(String tenantGroupCompanyCode, String tenantGroupCode,String level) { List ocpTenantGroupList = null; - if("".equals(lev) || "1".equals(lev)) { + if(StringUtils.isBlank(level) ) { //顶级目录 ocpTenantGroupList = tenantMapper.oneTenantGroup(); - } else if("".equals(lev) || "2".equals(lev)) { + } else if(StringUtils.isNotBlank(level) && "1".equals(level)) { //二级目录 ocpTenantGroupList = tenantMapper.selectGroups(tenantGroupCompanyCode); - } else if ("".equals(lev) || "3".equals(lev)) { + } else if (StringUtils.isNotBlank(level) && "2".equals(level) ||"3".equals(level)) { //三级目录 ocpTenantGroupList = tenantMapper.selectTenantGroups(tenantGroupCode, tenantGroupCompanyCode); @@ -128,13 +130,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/OcpTenantGroup.xml b/src/main/resources/mapper/OcpTenantGroup.xml index c904ee2..e7583ac 100644 --- a/src/main/resources/mapper/OcpTenantGroup.xml +++ b/src/main/resources/mapper/OcpTenantGroup.xml @@ -25,7 +25,7 @@ -- 2.26.0