From 857af6e4cd9d83e507e6c083cce23e5a3d7dfef9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=96=B9=E4=BA=AE?= <fltoo@qq.com>
Date: Fri, 24 Oct 2025 09:46:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bmw/service/impl/PmProjectServiceImpl.java | 18 +++++++++++-------
 .../mapper/bmw/ProStatisticsMapper.xml         |  1 +
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmProjectServiceImpl.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmProjectServiceImpl.java
index e8b6d88..ec235da 100644
--- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmProjectServiceImpl.java
+++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/service/impl/PmProjectServiceImpl.java
@@ -293,14 +293,18 @@ public class PmProjectServiceImpl implements PmProjectService {
 
     @Override
     public int updateSalary(List<UserWagePayVo> userWagePay) {
-        int i = pmProjectMapper.updateSalary(userWagePay);
-        if(i>0){
-            BigDecimal sum = userWagePay.stream()
-                    .map(UserWagePayVo::getActualMoney)
-                    .reduce(BigDecimal.ZERO, BigDecimal::add);
-            pmProjectMapper.updateMonthSalary(sum, userWagePay.get(0).getMonthId());
+        if(userWagePay != null && !userWagePay.isEmpty()){
+            int i = pmProjectMapper.updateSalary(userWagePay);
+            if(i>0){
+                BigDecimal sum = userWagePay.stream()
+                        .map(UserWagePayVo::getActualMoney)
+                        .reduce(BigDecimal.ZERO, BigDecimal::add);
+                pmProjectMapper.updateMonthSalary(sum, userWagePay.get(0).getMonthId());
+            }
+            return i;
+        }else{
+            return 0;
         }
-        return i;
     }
 
     @Override
diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/ProStatisticsMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/ProStatisticsMapper.xml
index ae390b6..7b57b78 100644
--- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/ProStatisticsMapper.xml
+++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/ProStatisticsMapper.xml
@@ -278,6 +278,7 @@
   <select id="getProAttMsg" resultType="com.bonus.bmw.domain.vo.HomePageSubProVo">
     SELECT
     pw.`name` as workerName,
+    pw.id as workerId,
     pw.id_number,
     pw.phone,
     bap.sub_id,