diff --git a/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java b/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java index fef83f20..7d02e752 100644 --- a/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java +++ b/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java @@ -189,10 +189,10 @@ public class CollectionServiceImpl implements CollectionService { vo.setOperReadRangeCd(StringUtil.getString(cVO.getOperReadRangeCd(), vo.getOperReadRangeCd())); vo.setOperOutRangeCd (StringUtil.getString(cVO.getOperOutRangeCd() , vo.getOperOutRangeCd())); vo.setUseStatus (StringUtil.getString(cVO.getUseStatus() , vo.getUseStatus())); - vo.setLentYn (StringUtil.getString(cVO.getLentYn() , vo.getLentYn())); - vo.setOnReqYn (StringUtil.getString(cVO.getOnReqYn() , vo.getOnReqYn())); - vo.setOffReqYn (StringUtil.getString(cVO.getOffReqYn() , vo.getOffReqYn())); - vo.setEtcYn (StringUtil.getString(cVO.getEtcYn() , vo.getEtcYn())); + vo.setLentYn (StringUtil.getString(cVO.getLentYn() , vo.getLentYn())); + vo.setOnReqYn (StringUtil.getString(cVO.getOnReqYn() , vo.getOnReqYn())); + vo.setOffReqYn (StringUtil.getString(cVO.getOffReqYn() , vo.getOffReqYn())); + vo.setEtcYn (StringUtil.getString(cVO.getEtcYn() , vo.getEtcYn())); vo.setRtnExpctDd (StringUtil.formatDateStr(cVO.getRtnExpctDd() , "-")); vo.setAwaiterCnt (StringUtil.getInt (cVO.getAwaiterCnt() , vo.getAwaiterCnt())); vo.setBookLentPsblYn (StringUtil.getString(cVO.getBookLentPsblYn() , vo.getBookLentPsblYn())); @@ -201,7 +201,7 @@ public class CollectionServiceImpl implements CollectionService { vo.setInterestYn (StringUtil.getString(cVO.getInterestYn() , vo.getInterestYn())); vo.setMUseYn (StringUtil.getString(cVO.getMUseYn() , vo.getMUseYn())); vo.setDigitalReadYn (StringUtil.getString(cVO.getDigitalReadYn() , vo.getDigitalReadYn())); - + vo.setMngtNo (StringUtil.getString(cVO.getMngtNo() , vo.getMngtNo())); vo.setMngOrgCd (StringUtil.getString(cVO.getMngOrgCd() , vo.getMngOrgCd())); vo.setMngOrgNm (StringUtil.getString(cVO.getMngOrgNm() , vo.getMngOrgNm())); } diff --git a/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java b/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java index a9c75696..1da98430 100644 --- a/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java +++ b/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java @@ -283,6 +283,7 @@ public class NlibSearchServiceImpl implements NlibSearchService{ CollectionVO vo = new CollectionVO(); vo.setMasterId(tmp.get("MASTER_ID").getAsString()); + vo.setMngtNo(tmp.get("MNGT_NO").getAsString()); list.add(vo); diff --git a/src/main/resources/egovframework/mapper/nlib/col/InterestDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/col/InterestDAO_SQL.xml index 7b67fe6f..a04c9598 100644 --- a/src/main/resources/egovframework/mapper/nlib/col/InterestDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/col/InterestDAO_SQL.xml @@ -9,6 +9,7 @@ MI.MB_INTEREST_ID ,RM.MASTER_ID ,RM.TITLE + ,RM.MNGT_NO ,IFNULL(RM.RPRS_THUMB_URL,"") RPRS_THUMB_URL ,IFNULL(SD.DEPT_NM,"") MNG_ORG_NM FROM diff --git a/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp b/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp index a511793a..99bad8d0 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp @@ -17,11 +17,12 @@ $(document).ready(function() { }); function goSearch(){ - /* if($("#top_query").val() != "") + if($("#top_query").val() == "") { - $('#searchHeaderForm input[name=filter_mylist]').val("search_query,"); - } */ - + alert("검색어를 입력해주세요."); + $("#top_query").focus(); + return false; + } document.searchHeaderForm.submit(); } diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp index 26660f9d..e3380142 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp @@ -261,13 +261,23 @@ var t_btn = ""; //대출, 방문 가능여부 - if(!gfn_isEmpty(obj.operOutRangeNm) && !gfn_isEmpty(obj.operReadRangeNm)) + if(obj.ableRentAppNow == true) { - t_btn +="