完善工时统计

wisenergy-service/src/main/java/cn/wisenergy/service/impl/StatisticsServiceImpl.java

@@ -547,6 +547,9 @@ public class StatisticsServiceImpl implements StatisticsService {
         // 所有项目的统计
         map.put("isAll", false);
         userProjectWorkTimeStatistics = workTimeOrderMapper.getUserProjectWorkTimeStatistics(map);
+        if (CollectionUtil.isEmpty(userProjectWorkTimeStatistics)) {
+            return null;
+        }
         UserWorkTimeStatisticsByProject userWorkTimeStatisticsByProject = new UserWorkTimeStatisticsByProject();
         // 拷贝属性
         BeanUtils.copyProperties(userWorkTimeStatisticsByProject, userProjectWorkTimeStatistics.get(0));
@@ -728,6 +731,9 @@ public class StatisticsServiceImpl implements StatisticsService {
     public HSSFWorkbook exportUserStatistics(Integer userId, Integer deptId, String startDate, String endDate) {
         log.info("StatisticsServiceImpl[]exportUserStatistics[]param{}" + userId + deptId + startDate + endDate);
         List<UserWorkTimeStatisticsByProject> userWorkTimeStatisticsReport = this.getUserWorkTimeStatisticsReport(userId, deptId, startDate, endDate);
+        if (CollectionUtil.isEmpty(userWorkTimeStatisticsReport)) {
+            return new HSSFWorkbook();
+        }
         // 部门信息
         WorkDept dept = workDeptMapper.getById(deptId);
         String statisticsStart = this.simpleDateToYearMonthDay(startDate);