diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/logger/EAILogRepositoryImpl.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/logger/EAILogRepositoryImpl.java index 53f4852..7ac9a79 100644 --- a/src/main/java/com/eactive/eai/rms/data/entity/onl/logger/EAILogRepositoryImpl.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/logger/EAILogRepositoryImpl.java @@ -118,21 +118,23 @@ public class EAILogRepositoryImpl implements EAILogRepository { .where(qeaiLog.id.logprcssserno.eq(eaiLogSearch.getSearchLogPrcssSerno())); return; } - - if (StringUtils.isNotBlank(eaiLogSearch.getSearchStartTime())) { - query + + boolean hasSvcSerno = StringUtils.isNotBlank(eaiLogSearch.getSearchEaiSvcSerno()); + + if (hasSvcSerno) { + query.where(qeaiLog.id.eaisvcserno.contains(eaiLogSearch.getSearchEaiSvcSerno())); + } else { + if (StringUtils.isNotBlank(eaiLogSearch.getSearchStartTime())) { + query .where(qeaiLog.id.msgdpstyms - .between(eaiLogSearch.getSearchStartTime(), eaiLogSearch.getSearchEndTime())); + .between(eaiLogSearch.getSearchStartTime(), eaiLogSearch.getSearchEndTime())); + } } - + if (StringUtils.isNotBlank(eaiLogSearch.getSearchEaiBzwkDstcd())) { query.where(qeaiLog.id.eaibzwkdstcd.eq(eaiLogSearch.getSearchEaiBzwkDstcd())); } - if (StringUtils.isNotBlank(eaiLogSearch.getSearchEaiSvcSerno())) { - query.where(qeaiLog.id.eaisvcserno.contains(eaiLogSearch.getSearchEaiSvcSerno())); - } - if (StringUtils.isNotBlank(eaiLogSearch.getSearchEaiSvcName())) { query.where(qeaiLog.eaisvcname.containsIgnoreCase(eaiLogSearch.getSearchEaiSvcName())); }