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

feat/training_260202 #67

Merged
gina merged 2 commits from feat/training_260202 into develop 2026-02-12 19:14:40 +09:00
Conversation 0 Commits 2 Files Changed 1 +5 -1
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();
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()) {