Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!548

mp-service/src/main/java/com/qs/mp/admin/service/impl/MarketingServiceImpl.java

@@ -124,10 +124,14 @@ public class MarketingServiceImpl extends ServiceImpl<MarketingMapper, Marketing
         int prizeQuantity = marketingAwardsList.stream().mapToInt(MarketingAwards::getQuantity).sum();
 
         // 校准并获取真实参与人数
-        int realNum = marketingUserCodeService.count(new LambdaQueryWrapper<MarketingUserCode>()
+        List<MarketingUserCode> realUserList = marketingUserCodeService.list(new LambdaQueryWrapper<MarketingUserCode>()
                 .eq(MarketingUserCode::getMarketingId, marketing.getId())
                 .eq(MarketingUserCode::getUserType, UserTypeEnum.ORDINARY.getValue())
                 .groupBy(MarketingUserCode::getMarketingId));
+        int realNum = 0;
+        if (CollectionUtils.isNotEmpty(realUserList)) {
+            realNum = realUserList.size();
+        }
 
         // 设置需要的内定人数
         int insideNum = 0;
@@ -351,10 +355,14 @@ public class MarketingServiceImpl extends ServiceImpl<MarketingMapper, Marketing
 
 
         // 真实用户
-        int realNum = marketingUserCodeService.count(new LambdaQueryWrapper<MarketingUserCode>()
+        List<MarketingUserCode> realUserList = marketingUserCodeService.list(new LambdaQueryWrapper<MarketingUserCode>()
                 .eq(MarketingUserCode::getMarketingId, marketing.getId())
                 .eq(MarketingUserCode::getUserType, UserTypeEnum.ORDINARY.getValue())
                 .groupBy(MarketingUserCode::getMarketingId));
+        int realNum = 0;
+        if (CollectionUtils.isNotEmpty(realUserList)) {
+            realNum = realUserList.size();
+        }
 
         // 获取最新活动信息
         marketing.setRealNum(realNum);