diff --git a/src/main/java/nlib/col/service/CollectionVO.java b/src/main/java/nlib/col/service/CollectionVO.java index bbec3f6a..184acfdb 100644 --- a/src/main/java/nlib/col/service/CollectionVO.java +++ b/src/main/java/nlib/col/service/CollectionVO.java @@ -216,13 +216,18 @@ public class CollectionVO extends PagingVO { return StringUtil.isEmpty(rprsThumbUrl) ? NlibProperty.getString("thumbnail.image.url.middle") : rprsThumbUrl; } public void setRprsThumbUrl(String rprsThumbUrl) { - this.rprsThumbUrl = StringUtil.isEmpty(rprsThumbUrl) ? rprsThumbUrl : NlibProperty.getString("thumbnail.image.url.prefix", "") + rprsThumbUrl; + setRprsThumbUrl(rprsThumbUrl, null); } public void setRprsThumbUrl(String rprsThumbUrl, String defaultImgUrl) { - if(StringUtil.isEmpty(rprsThumbUrl) || !rprsThumbUrl.startsWith("/")) this.rprsThumbUrl = defaultImgUrl; - else this.rprsThumbUrl = rprsThumbUrl; - this.rprsThumbUrl = StringUtil.isEmpty(this.rprsThumbUrl) ? this.rprsThumbUrl : NlibProperty.getString("thumbnail.image.url.prefix", "") + this.rprsThumbUrl; + if(StringUtil.isEmpty(rprsThumbUrl) || !(rprsThumbUrl.startsWith("/") || rprsThumbUrl.startsWith("http"))) { + // 썸네일이 비어있거나, 유효하지 않은 문자로 시작되는 경우, defaultImgUrl로 입력 + this.rprsThumbUrl = defaultImgUrl; + } else { + // 그렇지 않은 경우, 입력된 썸네일로 설정 + if(rprsThumbUrl.startsWith("http")) this.rprsThumbUrl = rprsThumbUrl; + else this.rprsThumbUrl = NlibProperty.getString("thumbnail.image.url.prefix", "") + rprsThumbUrl; + } } public String getUseYn() { return useYn; diff --git a/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java b/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java index 0322eb72..b37ca195 100644 --- a/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java +++ b/src/main/java/nlib/col/service/impl/CollectionServiceImpl.java @@ -203,25 +203,9 @@ public class CollectionServiceImpl implements CollectionService { vo.setReqPsblYn (cVO.getReqPsblYn()); vo.setInterestYn (cVO.getInterestYn()); vo.setMUseYn (cVO.getMUseYn()); - - // DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD - // API에 존재하지 않을 경우, 추가 DB 조회 - if(StringUtil.isEmpty(cVO.getMngOrgCd()) || StringUtil.isEmpty(cVO.getMngOrgNm())) { - CollectionVO dbVO = collectionDAO.selectMngOrgInfo(vo.getMasterId()); - if(dbVO != null) { - vo.setMngOrgCd(dbVO.getMngOrgCd()); - vo.setMngOrgNm(dbVO.getMngOrgNm()); - } - } + vo.setMngOrgCd (cVO.getMngOrgCd()); + vo.setMngOrgNm (cVO.getMngOrgNm()); } -// -// // DDDDDDDDDDDDDDDDDd 문화원 멀티 처리를 위해 테스트용으로 데이터 변경 -// CollectionVO vo = list.get(cnt-2); -// vo.setMngOrgCd("SU01"); -// vo.setMngOrgNm("마포문화원"); -// CollectionVO vo2 = list.get(cnt-1); -// vo2.setMngOrgCd("SU01"); -// vo2.setMngOrgNm("마포문화원"); return list; } diff --git a/src/main/java/nlib/user/web/UserInfoController.java b/src/main/java/nlib/user/web/UserInfoController.java index 3bb0e2d5..8128d98b 100644 --- a/src/main/java/nlib/user/web/UserInfoController.java +++ b/src/main/java/nlib/user/web/UserInfoController.java @@ -331,7 +331,6 @@ public class UserInfoController extends NlibCommonController { List interestList = interestService.listInterests(searchCollectionVO); int interestTotalCount = interestService.countListInterests(searchCollectionVO); - String mbInfoId = getMbInfoId(request); interestList = collectionService.setDetailInfoForList(interestList, searchCollectionVO.getMbInfoId(), NlibProperty.getString("thumbnail.image.url.small")); model.addAttribute("interestList", interestList);