diff --git a/cloud-background-common/src/main/java/com/muyu/cloud/background/domin/req/ProductListReq.java b/cloud-background-common/src/main/java/com/muyu/cloud/background/domin/req/ProductListReq.java index bf586c5..4437bd8 100644 --- a/cloud-background-common/src/main/java/com/muyu/cloud/background/domin/req/ProductListReq.java +++ b/cloud-background-common/src/main/java/com/muyu/cloud/background/domin/req/ProductListReq.java @@ -44,7 +44,7 @@ public class ProductListReq { * 状态 */ @Schema(description = "产品状态 同数据字典-系统是否",defaultValue = "1",type = "Integer") - private String productState; + private Integer productState; /** * 重要路径 */ diff --git a/cloud-background-server/src/main/java/com/muyu/cloud/background/service/impl/ApiManageServiceImpl.java b/cloud-background-server/src/main/java/com/muyu/cloud/background/service/impl/ApiManageServiceImpl.java index 519afeb..547a8e7 100644 --- a/cloud-background-server/src/main/java/com/muyu/cloud/background/service/impl/ApiManageServiceImpl.java +++ b/cloud-background-server/src/main/java/com/muyu/cloud/background/service/impl/ApiManageServiceImpl.java @@ -2,6 +2,7 @@ package com.muyu.cloud.background.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.cloud.background.domin.Company; import com.muyu.cloud.background.domin.Product; import com.muyu.cloud.background.domin.req.ProductListReq; import com.muyu.cloud.background.domin.resp.ProductListResp; @@ -39,8 +40,10 @@ public class ApiManageServiceImpl extends ServiceImpl LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.like(StringUtils.isNotEmpty(productListReq.getProductName()), Product::getProductName,productListReq.getProductName()); - queryWrapper.eq(StringUtils.isNotEmpty(productListReq.getProductState()), - Product::getProductState,productListReq.getProductState()); + if (productListReq.getProductState()!=null){ + queryWrapper.eq(Product::getProductState,productListReq.getProductState()); + } + queryWrapper.eq(StringUtils.isNotEmpty(productListReq.getProductType()), Product::getProductType,productListReq.getProductType()); long count = this.count(queryWrapper);