From 56c6afb58c29c785b0a363d1dac183c4b1b2e1aa Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 17 一月 2026 15:53:31 +0800
Subject: [PATCH] Merge branch 'jtwy' into dev_New

---
 src/main/resources/mapper/account/AccountIncomeMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/account/AccountIncomeMapper.xml b/src/main/resources/mapper/account/AccountIncomeMapper.xml
index 1cb49b9..7400904 100644
--- a/src/main/resources/mapper/account/AccountIncomeMapper.xml
+++ b/src/main/resources/mapper/account/AccountIncomeMapper.xml
@@ -43,7 +43,7 @@
     <select id="report" resultType="com.ruoyi.account.dto.AccountDto2">
         SELECT
         sdd.dict_label typeName,
-        sum(income_money) account
+        ifnull(sum(income_money),0) account
         FROM account_income ai
         left join sys_dict_data sdd on ai.income_type = sdd.dict_value and  sdd.dict_type='income_types'
         where
@@ -58,7 +58,7 @@
     </select>
     <select id="report1" resultType="java.math.BigDecimal">
         SELECT
-        sum(income_money) account
+        ifnull(sum(income_money),0) account
         FROM account_income ai
         where
         income_type=#{dictValue}

--
Gitblit v1.9.3