Quellcode durchsuchen

工时统计去除部门数据限制

fuyuchuan vor 6 Monaten
Ursprung
Commit
effccb9903

+ 2 - 2
service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/PmWorkContentServiceImpl.java

@@ -755,7 +755,7 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
         LambdaQueryWrapper<PmWorkContent> workTimeQuery = Wrappers.lambdaQuery();
         workTimeQuery.select(PmWorkContent::getSubmitterId, PmWorkContent::getReportId, PmWorkContent::getProjectId, PmWorkContent::getProjectName,
                         PmWorkContent::getWorkTime, PmWorkContent::getDeptId, PmWorkContent::getTenantId)
-                .eq(PmWorkContent::getTenantId, tenantId).eq(PmWorkContent::getDeptId, deptId);
+                .eq(PmWorkContent::getTenantId, tenantId);
         if (!users.isEmpty()) {
             workTimeQuery.in(PmWorkContent::getSubmitterId, users);
         }
@@ -1168,7 +1168,7 @@ public class PmWorkContentServiceImpl extends AbstractCrudService<PmWorkContentM
                 for (PmProject project : pmProjects) {
                     Integer projectId2 = project.getId();
                     String projectName = project.getProjectName();
-                    if (projectId2 == projectId1) {
+                    if (projectId2.equals(projectId1)) {
                         workHoursStatisticsVO.setProjectName(projectName);
                     }
                 }