From 561aa63737f42136c69e87a8d907727da235b38c Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 16 八月 2024 18:51:41 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo

---
 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorpaymentServiceImpl.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorpaymentServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorpaymentServiceImpl.java
index 620b893..e8ca745 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorpaymentServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorpaymentServiceImpl.java
@@ -121,7 +121,7 @@
                 map.put("STXS", StringUtils.isEmpty(serviceDonorchargeorgan1.getName()) ? "" : serviceDonorchargeorgan1.getName());
 
                 map.put("JE", serviceDonorchargeorgan1.getOrgancharge() == BigDecimal.ZERO ? "" : serviceDonorchargeorgan1.getOrgancharge());
-                map.put("BZ", "");
+                map.put("BZ", StringUtils.isEmpty(serviceDonorchargeorgan1.getOrganchargedesc()) ? "" : serviceDonorchargeorgan1.getOrganchargedesc());
                 hj += serviceDonorchargeorgan1.getOrgancharge().doubleValue();
 
                 newsList.add(map);

--
Gitblit v1.9.3