From b60ff6603770f4beb62450494bd2ca508ed00269 Mon Sep 17 00:00:00 2001
From: WeiRan <2392355487@qq.com>
Date: Sat, 31 Aug 2024 20:01:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../muyu/cloud/background/domin/req/ProductListReq.java    | 2 +-
 .../background/service/impl/ApiManageServiceImpl.java      | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

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<ApiManageMapper, Product>
         LambdaQueryWrapper<Product> 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);