完善工时统计

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

@@ -743,10 +743,10 @@ public class StatisticsServiceImpl implements StatisticsService {
         List<WorkLevel> workLevels = UserRoleLevelUtils.getlevelByIds(list);
         List<Integer> rank = this.getUserRank(workLevels, LevelEnum.PROJECT_STATISTICS.getLevelName());
 
-        // 非中心级不能选择部门
-        if (!rank.contains(LevelRankEnum.CENTRAL_LEVEL.getRank()) && deptId != null) {
-            throw new BaseCustomException(BASE_RESP_CODE_ENUM.NO_AUTHORITY);
-        }
+//        // 非中心级不能选择部门
+//        if (!rank.contains(LevelRankEnum.CENTRAL_LEVEL.getRank()) && deptId != null) {
+//            throw new BaseCustomException(BASE_RESP_CODE_ENUM.NO_AUTHORITY);
+//        }
 
         // 默认查询时间为当前
         if (year == null) {
@@ -847,7 +847,7 @@ public class StatisticsServiceImpl implements StatisticsService {
             startDate = projectStatisticsByMonths.get(0).getStatisticsDateAndWorkTimes().get(0).getDate();
             endDate = workProjectMapper.getLastDate(projectId);
         } else {
-            if (year < DateUtil.getYear(new Date())) {
+            if (year != DateUtil.getYear(new Date())) {
                 startDate = year + "年1月";
                 endDate = year + "年12月";
             }else {