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 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 @@