diff --git a/src/main/java/com/pms/ocp/controller/OcpTenantController.java b/src/main/java/com/pms/ocp/controller/OcpTenantController.java index 650b2969fbe5fe0581a5c29b7cf59e94e09ccc0e..7fc57d7339a687e772591de1efc90ac4dce57ec4 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.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 d23be9175578345eb463d1b65c7ed0c19b336da9..19ac022bce15f5f7ab9338d49d49d5f0701cb946 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 level; + + public String getClassIfy() { + return classIfy; + } + + public void setClassIfy(String classIfy) { + this.classIfy = classIfy; + } + + public String getLev() { + return level; + } + + public void setLev(String lev) { + this.level = level; + } + 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 fd1e814f83e94d2ff7b812e4fe7873f777a70221..a21427023aa407358338b529cd1529d8841017e7 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 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 7cf0f5891fbc43d2002e33ecdf0a93e173212b6e..bb19c3457572332aa17a0b6b88f8706f764bf530 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java @@ -37,15 +37,15 @@ public class TenantServiceImpl extends ServiceImpl * @return */ @Override - public List getTree(String tenantGroupCompanyCode, String tenantGroupCode) { + public List getTree(String tenantGroupCompanyCode, String tenantGroupCode,String level) { List ocpTenantGroupList = null; - if (StringUtils.isBlank(tenantGroupCode) && StringUtils.isBlank(tenantGroupCompanyCode)) { + if(StringUtils.isBlank(level) ) { //顶级目录 ocpTenantGroupList = tenantMapper.oneTenantGroup(); - } else if (!(StringUtils.isBlank(tenantGroupCompanyCode)) && StringUtils.isBlank(tenantGroupCode)) { + } else if(StringUtils.isNotBlank(level) && "1".equals(level)) { //二级目录 ocpTenantGroupList = tenantMapper.selectGroups(tenantGroupCompanyCode); - } else if (!(StringUtils.isBlank(tenantGroupCompanyCode)) && !(StringUtils.isBlank(tenantGroupCompanyCode))) { + } else if (StringUtils.isNotBlank(level) && "2".equals(level) ||"3".equals(level)) { //三级目录 ocpTenantGroupList = tenantMapper.selectTenantGroups(tenantGroupCode, tenantGroupCompanyCode); diff --git a/src/main/resources/mapper/OcpApiTreeMapper.xml b/src/main/resources/mapper/OcpApiTreeMapper.xml index 508f03da72fa10a467f9963a1c8b50a5e31d8ed0..f634b451a490d31fa5cbaec93380c55bba587896 100644 --- a/src/main/resources/mapper/OcpApiTreeMapper.xml +++ b/src/main/resources/mapper/OcpApiTreeMapper.xml @@ -15,7 +15,7 @@ diff --git a/src/main/resources/mapper/OcpTenantGroup.xml b/src/main/resources/mapper/OcpTenantGroup.xml index c904ee287826afe4abe8c556fd85f2a7d21fa2f8..e7583ac8a9fd2f7cc30ea5b8d104a5f76f858afe 100644 --- a/src/main/resources/mapper/OcpTenantGroup.xml +++ b/src/main/resources/mapper/OcpTenantGroup.xml @@ -25,7 +25,7 @@