需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/big/BigLogic.java

@@ -315,12 +315,14 @@ public class BigLogic {
                 .eq(UserLog::getType, "LOGIN")
                 .in(!CollectionUtils.isEmpty(companyIds), UserLog::getCompanyWechatId, companyIds)
                 .between(UserLog::getCreateTime, DateUtil.beginOfDay(new Date()), DateUtil.endOfDay(new Date()))
+                .groupBy(UserLog::getUserId)
                 .select(UserLog::getUserId)
                 .list().stream().map(UserLog::getUserId).collect(Collectors.toList());
 
 
         Integer allWorkerLogin = CollectionUtils.isEmpty(userIds)?0:websitUserService.lambdaQuery()
-                .in(!CollectionUtils.isEmpty(websitIds) ,WebsitUser::getWebsitId, websitIds).in(WebsitUser::getUserId,userIds).count();
+                .in(!CollectionUtils.isEmpty(websitIds) ,WebsitUser::getWebsitId, websitIds).in(WebsitUser::getUserId,userIds)
+                .count();
 
 
         List<String> userIdBefores = userLogService.lambdaQuery().eq(UserLog::getLoginType, IsYesNoEnum.NO.getKey())
@@ -328,6 +330,7 @@ public class BigLogic {
                 .eq(UserLog::getType, "LOGIN")
                 .in(!CollectionUtils.isEmpty(companyIds), UserLog::getCompanyWechatId, companyIds)
                 .between(UserLog::getCreateTime, DateUtil.offsetDay(DateUtil.beginOfDay(new Date()), -1), DateUtil.offsetDay(DateUtil.endOfDay(new Date()), -1))
+                .groupBy(UserLog::getUserId)
                 .select(UserLog::getUserId)
                 .list().stream().map(UserLog::getUserId).collect(Collectors.toList());