加非空判断，填充默认值

src/main/java/com/ydtech/modules/admin/service/impl/SysPartnerServiceImpl.java

@@ -692,9 +692,12 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
 
             List<SysUserAccountHistory> sysUserAccountHistories = sysUserAccountHistoryMapper.selectList(new LambdaQueryWrapper<SysUserAccountHistory>()
                     .in(SysUserAccountHistory::getUserId, userIdList).eq(SysUserAccountHistory::getProperty, 3));
-
-            BigDecimal extractFee = sysUserAccountHistories.stream().map(SysUserAccountHistory::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
-            appPartnerInfo.setExtractFee(extractFee);
+            if ( CollectionUtil.isNotEmpty(sysUserAccountHistories)) {
+                BigDecimal extractFee = sysUserAccountHistories.stream().map(SysUserAccountHistory::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+                appPartnerInfo.setExtractFee(extractFee);
+            }else {
+                appPartnerInfo.setExtractFee(BigDecimal.ZERO);
+            }
 
             appPartnerInfoList.add(appPartnerInfo);
         }
@@ -717,9 +720,12 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
 
         List<SysUserAccountHistory> sysUserAccountHistories = sysUserAccountHistoryMapper.selectList(new LambdaQueryWrapper<SysUserAccountHistory>()
                 .in(SysUserAccountHistory::getUserId, ids).eq(SysUserAccountHistory::getProperty, 3));
-
-        BigDecimal extractFee = sysUserAccountHistories.stream().map(SysUserAccountHistory::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
-        appPartnerInfoFreeVo.setExtractFee(extractFee);
+        if (CollectionUtil.isNotEmpty(sysUserAccountHistories)) {
+            BigDecimal extractFee = sysUserAccountHistories.stream().map(SysUserAccountHistory::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+            appPartnerInfoFreeVo.setExtractFee(extractFee);
+        }else {
+            appPartnerInfoFreeVo.setExtractFee(BigDecimal.ZERO);
+        }
 
         int sum = appPartnerInfoList.stream().mapToInt(APPPartnerInfo::getTeamManNum).sum();
         appPartnerInfoFreeVo.setTeamManNum(sum);
@@ -1417,10 +1423,12 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
         List<SysUserAccountHistory> sysUserAccountHistories = sysUserAccountHistoryMapper.selectList(new LambdaQueryWrapper<SysUserAccountHistory>()
                 .in(SysUserAccountHistory::getUserId, userIds).eq(SysUserAccountHistory::getProperty, 3)
                 .eq(teamUserInfosDto.getIndustrySector() != null, SysUserAccountHistory::getBusinessSegmentsType, teamUserInfosDto.getIndustrySector()));
-
-        BigDecimal extractFee = sysUserAccountHistories.stream().map(SysUserAccountHistory::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
-        teamUserInfosFreeVo.setExtractFee(extractFee);
-
+        if (CollectionUtil.isNotEmpty(sysUserAccountHistories)) {
+            BigDecimal extractFee = sysUserAccountHistories.stream().map(SysUserAccountHistory::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+            teamUserInfosFreeVo.setExtractFee(extractFee);
+        }else {
+            teamUserInfosFreeVo.setExtractFee(BigDecimal.ZERO);
+        }
 
         List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>()
                 .ne(SysUser::getStatus, 0).in(SysUser::getId, teamUserInfosDto.getUserIds()));
@@ -1447,9 +1455,12 @@ public class SysPartnerServiceImpl extends ServiceImpl<SysPartnerMapper, SysPart
             List<SysUserAccountHistory> sysUserAccountHistorie = sysUserAccountHistoryMapper.selectList(new LambdaQueryWrapper<SysUserAccountHistory>()
                     .in(SysUserAccountHistory::getUserId, sysUser.getId()).eq(SysUserAccountHistory::getProperty, 3)
                     .eq(teamUserInfosDto.getIndustrySector() != null, SysUserAccountHistory::getBusinessSegmentsType, teamUserInfosDto.getIndustrySector()));
-
-            BigDecimal extractFee1 = sysUserAccountHistorie.stream().map(SysUserAccountHistory::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
-            teamUserInfosVo.setExtractFee(extractFee1);
+            if (CollectionUtil.isNotEmpty(sysUserAccountHistorie)) {
+                BigDecimal extractFee1 = sysUserAccountHistorie.stream().map(SysUserAccountHistory::getAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+                teamUserInfosVo.setExtractFee(extractFee1);
+            }else {
+                teamUserInfosVo.setExtractFee(BigDecimal.ZERO);
+            }
 
             userInfosVoList.add(teamUserInfosVo);
         }