Merge pull request #75 from eureca-final-capstone-project/develop

Jang-GO · web-flow · commit cae76da9ccdf · 2025-07-29T17:41:21.000+09:00
main 병합
diff --git a/src/main/java/eureca/capstone/project/admin/user/repository/impl/UserRepositoryImpl.java b/src/main/java/eureca/capstone/project/admin/user/repository/impl/UserRepositoryImpl.java
@@ -68,7 +68,8 @@ public Page<UserResponseDto> getUserList(String keyword, Pageable pageable) {
         JPAQuery<Long> count = jpaQueryFactory
                 .select(user.countDistinct())
                 .from(user)
-                .where(searchCondition(keyword));
+                .where(searchCondition(keyword),
+                        user.status.statusId.in(12,13));
 
         return PageableExecutionUtils.getPage(userList, pageable, count::fetchOne);
     }

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,8 @@ public Page<UserResponseDto> getUserList(String keyword, Pageable pageable) {`
`68`	`68`	`JPAQuery<Long> count = jpaQueryFactory`
`69`	`69`	`.select(user.countDistinct())`
`70`	`70`	`.from(user)`
`71`		`- .where(searchCondition(keyword));`
	`71`	`+ .where(searchCondition(keyword),`
	`72`	`+ user.status.statusId.in(12,13));`
`72`	`73`
`73`	`74`	`return PageableExecutionUtils.getPage(userList, pageable, count::fetchOne);`
`74`	`75`	`}`