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

Reviewed-on: #67
2026-02-12 19:14:39 +09:00
parent b0cf9e77ec c92426aefc
commit 9e803661cd
1 changed files with 5 additions and 1 deletions
--- a/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelMngRepositoryImpl.java
+++ b/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelMngRepositoryImpl.java
@@ -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()) {