From eeb7007dee6b349135e453ff957992c872866a9a Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 19 十月 2021 14:05:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/WarehouseDonatesExcelListen.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/WarehouseDonatesExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/WarehouseDonatesExcelListen.java
index 724ca09..33eb274 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/WarehouseDonatesExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/WarehouseDonatesExcelListen.java
@@ -46,8 +46,10 @@
             if (quantity <= 0) {
                 throw new ServiceException("捐赠数量有误");
             }
-            if (StringUtils.isEmpty(warehouseDonatesExcelVO.getName())
-                    || isNull(warehouseDonatesExcelVO.getIsAnonymous())) {
+            if (isNull(warehouseDonatesExcelVO.getIsAnonymous())) {
+                warehouseDonatesExcelVO.setIsAnonymous("否");
+            }
+            if (StringUtils.isEmpty(warehouseDonatesExcelVO.getName())) {
                 warehouseDonatesExcelVO.setIsAnonymous("是");
             }
             if (isNull(warehouseDonatesExcelVO.getSigningAt())) {

--
Gitblit v1.7.1