应用bug修改

src/main/java/com/pms/ocp/model/dto/PageGroupDto.java

@@ -8,7 +8,7 @@ import java.sql.Timestamp;
 /**
  * 分页查询dto
  */
-public class PageGroupDto extends PageParam {
+public class PageGroupDto{
 
 
     @ApiModelProperty("主键ID")
@@ -57,6 +57,29 @@ public class PageGroupDto extends PageParam {
     @ApiModelProperty("模糊查询字段")
     private String keyword;
 
+
+    @ApiModelProperty("分页条数")
+    private int currentPage;
+
+    @ApiModelProperty("分页树")
+    private int pageSize;
+
+    public int getCurrentPage() {
+        return currentPage;
+    }
+
+    public void setCurrentPage(int currentPage) {
+        this.currentPage = currentPage;
+    }
+
+    public int getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(int pageSize) {
+        this.pageSize = pageSize;
+    }
+
     public String getKeyword() {
         return keyword;
     }

src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java

@@ -60,6 +60,19 @@ public class OcpApiGroup {
   @ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ")
   private String apiGroupLevel;
 
+
+  @ApiModelProperty("上级分类名称")
+  @TableField(exist = false)
+  private String classIfy;
+
+  public String getClassIfy() {
+    return classIfy;
+  }
+
+  public void setClassIfy(String classIfy) {
+    this.classIfy = classIfy;
+  }
+
   public String getApiGroupLevel() {
     return apiGroupLevel;
   }

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

@@ -91,6 +91,9 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG
             if ("sys_center".equals(ocpApiGroup.getApiGroupLevel())) {
                 ocpApiGroup.setApiGroupLevel("api_group");
             }
+            if (StringUtils.isBlank(ocpApiGroup.getApiGroupLevel())){
+                ocpApiGroup.setApiGroupLevel("Middleground");
+            }
             mapper.insert(ocpApi);
         } else {
             return ocpApi;
@@ -158,7 +161,7 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG
      */
     @Override
     public Page<OcpApiGroup> getOnePages(PageGroupDto pageGroupDto) {
-        Page pageInfo = new Page(pageGroupDto.getPageNum(), pageGroupDto.getPageSize());
+        Page<OcpApiGroup> pageInfo = new Page(pageGroupDto.getCurrentPage(), pageGroupDto.getPageSize());
         LambdaQueryWrapper<OcpApiGroup> qw = new LambdaQueryWrapper<>();
         if (StringUtils.isBlank(pageGroupDto.getKeyword())) {
             if (StringUtils.isBlank(pageGroupDto.getApiGroupCode())){
@@ -167,8 +170,15 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG
 
             } else if(!(StringUtils.isNotBlank(pageGroupDto.getApiGroupPcode()))){
                 List<OcpApiGroup> ocpApiGroups = mapper.selectLists(pageGroupDto.getApiGroupPromotionType(), pageGroupDto.getApiGroupCode());
+                qw.eq(OcpApiGroup::getApiGroupPromotionType,pageGroupDto.getApiGroupPromotionType()).and(c->c.eq(OcpApiGroup::getApiGroupPcode,pageGroupDto.getApiGroupCode()));
                 pageInfo.setRecords(ocpApiGroups);
-               pageInfo.setTotal(ocpApiGroups.size());
+                mapper.selectPage(pageInfo,qw);
+                List<OcpApiGroup> records = pageInfo.getRecords();
+                for (OcpApiGroup record : records) {
+                    OcpApiGroup ocpApiGroup = mapper.selectCode(record.getApiGroupPcode());
+                    record.setClassIfy(ocpApiGroup.getApiGroupName());
+                }
+
 
             }
         } else if(StringUtils.isNotBlank(pageGroupDto.getKeyword())){
@@ -176,6 +186,9 @@ public class OcpApiTreeServiceImpl extends ServiceImpl<OcpApiTreeMapper, OcpApiG
                     .and(c->c.eq(OcpApiGroup::getApiGroupPcode, pageGroupDto.getApiGroupCode()));
             mapper.selectPage(pageInfo, ocpTenantGroupLambdaQueryWrapper);
         }
+
+
+
         return pageInfo;
     }
 }

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

@@ -173,20 +173,14 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
         OcpTenantGroup ocpTenantGroup = tenantMapper.selectGroupCode(tenantGroupCode);
 
         Page<OcpTenantGroup> page = new Page<>(currentPage, pageSize);
+
         if (StringUtils.isBlank(keyword)) {
-            if ("".equals(lev) || "1".equals(lev)) {
+            if (StringUtils.isBlank(lev) || "1".equals(lev) ) {
                 LambdaQueryWrapper<OcpTenantGroup> eq = qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode);
                 tenantMapper.selectPage(page, eq);
             } else if ("2".equals(lev) || "3".equals(lev)) {
-
-                List<OcpTenantGroup> ocpTenantGroupList = tenantMapper.selectTenantGroupsList(tenantGroupCode, tenantGroupCompanyCode);
-                for (OcpTenantGroup tenantGroup : ocpTenantGroupList) {
-                    String tenantGroupCode1 = tenantGroup.getTenantGroupCode();
-                    OcpTenantGroup ocpTenantGroup1 = tenantMapper.selectGroupName(tenantGroupCode1);
-                    tenantGroup.setClassIfy(ocpTenantGroup1.getTenantGroupName());
-                }
-//                LambdaQueryWrapper<OcpTenantGroup> eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)).eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode);
-                page.setRecords(ocpTenantGroupList);
+               LambdaQueryWrapper<OcpTenantGroup> eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)).eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode);
+                tenantMapper.selectPage(page,eq);
             }
         } else if (!(StringUtils.isBlank(keyword))) {
             LambdaQueryWrapper<OcpTenantGroup> ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpTenantGroup::getTenantGroupCompanyCode, keyword))
@@ -201,7 +195,14 @@ public class TenantServiceImpl extends ServiceImpl<TenantMapper, OcpTenantGroup>
 //            page.setRecords(ocpTenantGroupList);
 //            page.setTotal(ocpTenantGroupList.size());
         }
-
+        if (StringUtils.isBlank(page.toString())) {
+            List<OcpTenantGroup> records = page.getRecords();
+            for (OcpTenantGroup record : records) {
+                String tenantGroupCode1 = record.getTenantGroupName();
+                OcpTenantGroup ocpTenantGroup1 = tenantMapper.selectGroupName(tenantGroupCode1);
+                record.setClassIfy(ocpTenantGroup1.getTenantGroupName());
+            }
+        }
 
         return page;
 

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};
+        SELECT * FROM ocp_tenant_group WHERE  tenant_group_company_code = #{tenantGroupCompanyCode} and tenant_group_pcode = '';
     </select>
 
 <!--    根据创建公司和分类名称获取集合-->