完善工时统计

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

@@ -271,7 +271,7 @@ public class StatisticsServiceImpl implements StatisticsService {
         // 用户权限
         List<String> userAuthority = this.getUserAuthority(userId);
         // 没有审批权限
-        if (CollectionUtil.isNotEmpty(userAuthority) || !userAuthority.contains(LevelEnum.EXAMINE.getLevelName())) {
+        if (CollectionUtil.isEmpty(userAuthority) || !userAuthority.contains(LevelEnum.EXAMINE.getLevelName())) {
             throw new BaseCustomException(BASE_RESP_CODE_ENUM.THE_USER_NOT_MANAGER_PLASE_MANAGER_LOGIN);
         }
         WorkUser user = workUserService.getById(userId);
@@ -528,11 +528,10 @@ public class StatisticsServiceImpl implements StatisticsService {
             deptId = DEFAULT_DEPT_ID;
         }
 
-        // 默认统计截至时间为前一天
+        // 默认统计截至时间为当天
         if (StringUtil.isEmpty(endDate)) {
             Date date = new Date();
-            Date yesterday = DateUtil.add(date, Calendar.DAY_OF_MONTH, -1);
-            endDate = DateUtil.convertDateToYMDStr(yesterday);
+            endDate = DateUtil.convertDateToYMDStr(date);
         }
         Map<String, Object> map = new HashMap<>();
         map.put("isConclusion", isConclusion);