Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop동기화 #259

Merged
merged 8 commits into from
May 8, 2024
Merged

Develop동기화 #259

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
050bf66
Merge pull request #247 from WE-ARE-RACCOONS/develop
ywj9811 Apr 24, 2024
9e06991
Merge pull request #249 from WE-ARE-RACCOONS/develop
ywj9811 Apr 26, 2024
b8f60cc
Merge pull request #251 from WE-ARE-RACCOONS/develop
ywj9811 Apr 28, 2024
7404b68
Merge pull request #253 from WE-ARE-RACCOONS/develop
ywj9811 Apr 28, 2024
14fe980
Merge pull request #255 from WE-ARE-RACCOONS/develop
ywj9811 May 2, 2024
a26df1e
Merge pull request #257 from WE-ARE-RACCOONS/develop
ywj9811 May 5, 2024
15ae876
RAC-364 HotFix : 계좌 업데이트시 정산 동기화 오류 수정
ywj9811 May 8, 2024
561979d
Merge pull request #258 from WE-ARE-RACCOONS/RAC-364
ywj9811 May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/main/java/com/postgraduate/domain/salary/domain/repository/SalaryDslRepositoryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,14 @@ public List<Salary> findAllByDone() {

@Override
public List<Salary> findAllBySalaryNoneAccount(LocalDate salaryDate, Senior searchSenior) {
Salary nowSalary = queryFactory.selectFrom(salary)
List<Salary> nowSalaries = queryFactory.selectFrom(salary)
.where(
salary.senior.eq(searchSenior),
salary.salaryDate.eq(salaryDate)
.or(salary.salaryDate.goe(salaryDate))
)
.fetchOne();
if (nowSalary.getAccount() == null) {
.fetch();
if (nowSalaries.get(0).getAccount() == null) {
return queryFactory.selectFrom(salary)
.distinct()
.where(
Expand All @@ -144,7 +145,7 @@ public List<Salary> findAllBySalaryNoneAccount(LocalDate salaryDate, Senior sear
.fetchJoin()
.fetch();
}
return List.of(nowSalary);
return nowSalaries;
}
}

Loading