From f80ecdc95737fd79be0b102b00423af80d7be8c1 Mon Sep 17 00:00:00 2001
From: helm30 <helm30@midea.com>
Date: Fri, 9 May 2025 01:11:37 +0800
Subject: [PATCH] =?UTF-8?q?fix(extension):=20=E4=BF=AE=E5=A4=8D=20Db=20?=
 =?UTF-8?q?=E7=B1=BB=20count=20=E6=96=B9=E6=B3=95=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=80=BC=E4=B8=BA=E7=A9=BA=E6=97=B6=E7=9A=84=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?-=20=E5=9C=A8=20Db=20=E7=B1=BB=E4=B8=AD=E7=9A=84=20count=20?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=B8=AD=E5=A2=9E=E5=8A=A0=E7=A9=BA=E5=80=BC?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=EF=BC=8C=E9=81=BF=E5=85=8D=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=20null=20=E6=97=B6=E6=8A=9B=E5=87=BA=E7=A9=BA=E6=8C=87?=
 =?UTF-8?q?=E9=92=88=E5=BC=82=E5=B8=B8=20-=20=E6=96=B0=E5=A2=9E=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=20count=20=E6=96=B9=E6=B3=95=E5=9C=A8=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E4=B8=BA=E7=A9=BA=E6=97=B6=E7=9A=84=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/baomidou/mybatisplus/extension/toolkit/Db.java | 3 ++-
 .../java/com/baomidou/mybatisplus/test/toolkit/DbTest.java  | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/Db.java b/mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/Db.java
index 2deb49a413..956acd9f5d 100644
--- a/mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/Db.java
+++ b/mybatis-plus-extension/src/main/java/com/baomidou/mybatisplus/extension/toolkit/Db.java
@@ -346,7 +346,8 @@ public static <T> long count(T entity) {
      * @param queryWrapper 实体对象封装操作类 {@link com.baomidou.mybatisplus.core.conditions.query.QueryWrapper}
      */
     public static <T> long count(AbstractWrapper<T, ?, ?> queryWrapper) {
-        return SqlHelper.execute(getEntityClass(queryWrapper), baseMapper -> baseMapper.selectCount(queryWrapper));
+         Long count = SqlHelper.execute(getEntityClass(queryWrapper), baseMapper -> baseMapper.selectCount(queryWrapper));
+         return count == null ? 0L : count;
     }
 
     /**
diff --git a/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/toolkit/DbTest.java b/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/toolkit/DbTest.java
index 8c6119bfcb..0b736544f9 100644
--- a/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/toolkit/DbTest.java
+++ b/mybatis-plus/src/test/java/com/baomidou/mybatisplus/test/toolkit/DbTest.java
@@ -280,6 +280,12 @@ void testGetObj() {
         Assertions.assertEquals("ruben", name);
     }
 
+    @Test
+    void count() {
+        long count = Db.count(Wrappers.lambdaQuery(Entity.class).eq(Entity::getName, UUID.randomUUID().toString()));
+        Assertions.assertSame(0L, count);
+    }
+
 
     @Override
     protected String tableDataSql() {