应用树--改

src/main/java/com/pms/ocp/controller/OcpTenantController.java

@@ -36,7 +36,7 @@ public class OcpTenantController {
     @GetMapping("/tenantOnetree")
     @ApiModelProperty("应用树分类")
     private List<OcpTenantGroup> getTenantTree(OcpTenantGroup ocpTenantGroup) {
-        List<OcpTenantGroup> tree= tenantService.getTree(ocpTenantGroup.getTenantGroupCompanyCode(),ocpTenantGroup.getTenantGroupCode(),ocpTenantGroup.getLev());
+        List<OcpTenantGroup> tree= tenantService.getTree(ocpTenantGroup.getTenantGroupCompanyCode(),ocpTenantGroup.getTenantGroupCode(),ocpTenantGroup.getLevel());
         return tree;
     }
     @GetMapping("/tenantselect")

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() {

src/main/java/com/pms/ocp/service/TenantService.java

@@ -16,7 +16,7 @@ public interface TenantService  extends IService<OcpTenantGroup> {
      * 应用树分类管理
      * @return
      */
-    List<OcpTenantGroup> getTree(String tenantGroupCode,String tenantGroupCompanyCode,String lev);
+    List<OcpTenantGroup> getTree(String tenantGroupCode,String tenantGroupCompanyCode,String level);
 
     /**
      * 应用新增

src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java

 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<TenantMapper, OcpTenantGroup>
      * @return
      */
     @Override
-    public List<OcpTenantGroup> getTree(String tenantGroupCompanyCode, String tenantGroupCode,String lev) {
+    public List<OcpTenantGroup> getTree(String tenantGroupCompanyCode, String tenantGroupCode,String level) {
         List<OcpTenantGroup> 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<TenantMapper, OcpTenantGroup>
      * @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<OcpTenantGroup> wrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<OcpTenantGroup> lambdaQueryWrapper = wrapper.eq(OcpTenantGroup::getTenantGroupPcode, ocpTenantGroup1.getTenantGroupCode());
-        if (StringUtils.isBlank(lambdaQueryWrapper.toString())){
+        if (!(StringUtils.isBlank(lambdaQueryWrapper.toString()))){
              tenantMapper.deleteById(objId);
          }else {
              flag = false;

src/main/resources/mapper/OcpTenantGroup.xml

@@ -25,7 +25,7 @@
 
 
     <select id="selectGroups" resultType="com.pms.ocp.model.entity.OcpTenantGroup">
-        SELECT * FROM ocp_tenant_group WHERE  tenant_group_company_code = #{tenantGroupCompanyCode} and tenant_group_level = 'Middleground' ;
+        SELECT * FROM ocp_tenant_group WHERE  tenant_group_company_code = #{tenantGroupCompanyCode};
     </select>
 
 <!--    根据创建公司和分类名称获取集合-->