diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/EnterpriseBigScreenController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/EnterpriseBigScreenController.java index 2b7da484..080a90d7 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/EnterpriseBigScreenController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bigscreen/controller/EnterpriseBigScreenController.java @@ -1,6 +1,7 @@ package org.dromara.bigscreen.controller; import cn.dev33.satoken.annotation.SaCheckPermission; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.annotation.Resource; import org.dromara.bigscreen.domain.dto.WeatherQueryReq; @@ -217,12 +218,18 @@ public class EnterpriseBigScreenController { // return vo; // }).toList()); ArrayList projectAttendanceCountVos = new ArrayList<>(); + List busProjects = projectService.getBaseMapper().selectList(new LambdaQueryWrapper().eq(BusProject::getPId, 0L).eq(BusProject::getIsDelete,0)); + List projectIds = new ArrayList<>(); + for (BusProject busProject : busProjects) { + projectIds.add(busProject.getId()); + } List list = attendanceService.list(Wrappers.lambdaQuery() .eq(BusAttendance::getClockDate, LocalDate.now()) .in(BusAttendance::getClockStatus, Arrays.asList("1", "2", "3")) + .in(BusAttendance::getProjectId, projectIds) ); - List relevancyList = userProjectRelevancyService.list(); + List relevancyList = userProjectRelevancyService.list(new LambdaQueryWrapper().in(BusUserProjectRelevancy::getProjectId, projectIds)); // 转换为 Map Map projectUserCountMap = relevancyList.stream()