Merge remote-tracking branch 'origin/master'

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());
+        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

@@ -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;
     }

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);
+    List<OcpTenantGroup> getTree(String tenantGroupCode,String tenantGroupCompanyCode,String level);
 
     /**
      * 应用新增

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

@@ -37,15 +37,15 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
      * @return
      */
     @Override
-    public List<OcpTenantGroup> getTree(String tenantGroupCompanyCode, String tenantGroupCode) {
+    public List<OcpTenantGroup> getTree(String tenantGroupCompanyCode, String tenantGroupCode,String level) {
         List<OcpTenantGroup> 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);
 

src/main/resources/mapper/OcpApiTreeMapper.xml

@@ -15,7 +15,7 @@
     </select>
 <!--服务树 -查询-->
     <select id="selectLists" resultType="com.pms.ocp.model.entity.OcpApiGroup">
- SELECT * FROM ocp_api_group WHERE api_group_promotion_type = #{apiGroupPromotionType} and api_group_pcode = #{apiGroupCode} and api_group_level = #{apiGroupLevel};
+ SELECT * FROM ocp_api_group WHERE api_group_promotion_type = #{apiGroupPromotionType} and api_group_pcode = #{apiGroupCode};
     </select>
 
 

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>
 
 <!--    根据创建公司和分类名称获取集合-->