‘linchangsheng’ 7 月之前
父节点
当前提交
97175691da
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2 1
      mall-server-api/src/main/java/com/gree/mall/manager/logic/big/BigLogic.java

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

@@ -269,7 +269,8 @@ public class BigLogic {
                 .between(UserLog::getCreateTime, DateUtil.offsetDay(DateUtil.beginOfDay(new Date()), -1), DateUtil.offsetDay(DateUtil.endOfDay(new Date()), -1))
                 .count();
 
-        Integer allWorker = websitUserService.lambdaQuery().in(CollectionUtils.isEmpty(websitIds),WebsitUser::getWebsitId, websitIds).groupBy(WebsitUser::getUserId)
+        Integer allWorker = websitUserService.lambdaQuery().in(!CollectionUtils.isEmpty(websitIds) && !adminUser.getIsMaster(),WebsitUser::getWebsitId, websitIds)
+                .groupBy(WebsitUser::getUserId)
                 .count();