diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java index 56f71b38..6b212c81 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java @@ -2660,7 +2660,8 @@ public List listCntrlHstry(String id){ .where( fpb.aprvlYn.eq("Y"), fpccr.planSno.isNull(), - ccb.cntrlEndDt.between(start, end), + ccb.statusCd.isNull(), + ccb.cntrlId.isNull(), fpb.aprvlDt.between(start, end) ) .fetch();