From 134212bd1b9cf4f24016c15b77e049369b85ba8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Tue, 2 Apr 2024 13:48:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=8B=A4=E5=B7=B2=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4BUG=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/controller/BusinessWorkerCqController.java       | 2 +-
 .../business/service/impl/BusinessWorkerCqServiceImpl.java    | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/renren/modules/business/controller/BusinessWorkerCqController.java b/src/main/java/io/renren/modules/business/controller/BusinessWorkerCqController.java
index 43ba351..692ee89 100644
--- a/src/main/java/io/renren/modules/business/controller/BusinessWorkerCqController.java
+++ b/src/main/java/io/renren/modules/business/controller/BusinessWorkerCqController.java
@@ -107,7 +107,7 @@ public class BusinessWorkerCqController {
             if (item.get("userId") != null && !item.get("userId").toString().equals("")) {
                 businessWorkerCqEntity.setUserId(Integer.parseInt(item.get("userId").toString()));
             }
-            if (!"".equals(item.get("fixDay").toString().trim())) {
+            if (item.get("fixDay")!=null && !"".equals(item.get("fixDay").toString().trim())) {
                 businessWorkerCqEntity.setFixDay(item.get("fixDay").toString());
             }
             if (!Objects.isNull(item.get("remark"))) {
diff --git a/src/main/java/io/renren/modules/business/service/impl/BusinessWorkerCqServiceImpl.java b/src/main/java/io/renren/modules/business/service/impl/BusinessWorkerCqServiceImpl.java
index 11e7c59..fa49c22 100644
--- a/src/main/java/io/renren/modules/business/service/impl/BusinessWorkerCqServiceImpl.java
+++ b/src/main/java/io/renren/modules/business/service/impl/BusinessWorkerCqServiceImpl.java
@@ -163,7 +163,9 @@ public class BusinessWorkerCqServiceImpl extends ServiceImpl<BusinessWorkerCqDao
 
                 BigDecimal fixBg = BigDecimal.ZERO;
                 if(item.get("fix_day")!=null) {
-                    fixBg = new BigDecimal(item.get("fix_day").toString());
+                    if(!"".equals(item.get("fix_day").toString().trim())){
+                        fixBg = new BigDecimal(item.get("fix_day").toString());
+                    }
                 }
 
                 resultMap.put("outWorkDay",statusBg.add(fixBg));