MVPTeam/kamco-train-api
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'feat/training_260202' (#67) from feat/training_260202 into develop

Browse Source 
Reviewed-on: #67
This commit was merged in pull request #67.
This commit is contained in:
Gina(박가연)
2026-02-12 19:14:39 +09:00
parent b0cf9e77ec c92426aefc
commit 9e803661cd
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/kamco/cd/training/postgres/repository/model/ModelMngRepositoryImpl.java
View File

@@ -39,7 +39,11 @@ public class ModelMngRepositoryImpl implements ModelMngRepositoryCustom {
BooleanBuilder builder = new BooleanBuilder(); BooleanBuilder builder = new BooleanBuilder();
if (req.getStatus() != null && !req.getStatus().isEmpty()) { if (req.getStatus() != null && !req.getStatus().isEmpty()) {
builder.and(modelMasterEntity.statusCd.eq(req.getStatus())); builder.and(
modelMasterEntity
.step1State
.eq(req.getStatus())
.or(modelMasterEntity.step2State.eq(req.getStatus())));
} }
if (req.getModelNo() != null && !req.getModelNo().isEmpty()) { if (req.getModelNo() != null && !req.getModelNo().isEmpty()) {