完善工时统计

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

@@ -523,11 +523,13 @@ public class StatisticsServiceImpl implements StatisticsService {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.NO_AUTHORITY);
         }
 
-        // 不是中心级不能选择部门
-        if (!rank.contains(LevelRankEnum.CENTRAL_LEVEL.getRank()) && deptId != null) {
+
+        // 不是中心级不能选择部门,只能查看自己部门的信息
+        if (!rank.contains(LevelRankEnum.CENTRAL_LEVEL.getRank()) && deptId != user.getDeptId()) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.NO_AUTHORITY);
         }
 
+
         // 默认统计截至时间为当天
         if (StringUtil.isEmpty(endDate)) {
             Date date = new Date();
@@ -735,7 +737,10 @@ public class StatisticsServiceImpl implements StatisticsService {
         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();
+            HSSFWorkbook sheets = new HSSFWorkbook();
+            HSSFSheet sheet = sheets.createSheet();
+            sheet.createRow(0).createCell(0).setCellValue("暂无数据");
+            return sheets;
         }
         // 部门信息
         WorkDept dept = workDeptMapper.getById(deptId);