diff --git 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
index 933e428..4ea1daf 100644
--- 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()) {