licailing 4 лет назад
Родитель
Сommit
d10bd2c9e4

+ 2 - 0
src/main/java/com/izouma/nineth/repo/UserRepo.java

@@ -172,6 +172,8 @@ public interface UserRepo extends JpaRepository<User, Long>, JpaSpecificationExe
 
 
     List<User> findAllByCreatedAtIsAfterAndAuthoritiesContains(LocalDateTime createdAt, Authority authorities);
     List<User> findAllByCreatedAtIsAfterAndAuthoritiesContains(LocalDateTime createdAt, Authority authorities);
 
 
+    List<User> findAllByCreatedAtIsAfterAndAdminFalse(LocalDateTime createdAt);
+
     List<User> findBySettleAccountIdIsNotNull();
     List<User> findBySettleAccountIdIsNotNull();
 
 
     @Transactional
     @Transactional

+ 1 - 1
src/main/java/com/izouma/nineth/service/StatisticService.java

@@ -63,7 +63,7 @@ public class StatisticService {
     public Map<String, Long> userTrend(int day) {
     public Map<String, Long> userTrend(int day) {
         LocalDateTime date = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
         LocalDateTime date = LocalDateTime.of(LocalDate.now(), LocalTime.MIN);
         LocalDateTime start = date.minusDays(day);
         LocalDateTime start = date.minusDays(day);
-        List<User> users = userRepo.findAllByCreatedAtIsAfterAndAuthoritiesContains(start, Authority.get(AuthorityName.ROLE_USER));
+        List<User> users = userRepo.findAllByCreatedAtIsAfterAndAdminFalse(start);
         return users.stream().collect(Collectors.groupingBy(
         return users.stream().collect(Collectors.groupingBy(
                 item -> DateTimeFormatter.ofPattern("yyyy-MM-dd").format(item.getCreatedAt()), Collectors.counting()));
                 item -> DateTimeFormatter.ofPattern("yyyy-MM-dd").format(item.getCreatedAt()), Collectors.counting()));
     }
     }