Merge remote-tracking branch 'origin/master'

Conflicts: src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java
2021-11-17 12:31:36 +09:00 · 2021-11-17 12:31:36 +09:00 · db33ed791b
commit db33ed791b
parent bcc9980c89 835593d324
8 changed files with 127 additions and 35 deletions
--- a/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java
+++ b/src/main/java/nlib/sch/service/impl/NlibSearchServiceImpl.java
@ -304,4 +304,5 @@ public class NlibSearchServiceImpl implements NlibSearchService{
    	}
 		return searchVO;
 	}
-};
+}
+
--- a/src/main/java/nlib/user/web/MemberController.java
+++ b/src/main/java/nlib/user/web/MemberController.java
@ -359,7 +359,7 @@ public class MemberController extends NlibCommonController{
 		
 		String jsessionId = session.getId();
 		OAuthUniversalUser oauthUser = SessionConfig.popNewMemberInfo(jsessionId);
-		if(oauthUser.getNlibVO()!=null)
+		if(oauthUser != null && oauthUser.getNlibVO()!=null)
 		{
 			//핸드폰인증시 sns제공 번호와 회원가입폼 번호 비교
 			if(!(vo.getMobileNo().equals(oauthUser.getSnsMobileNo())))
@ -808,6 +808,7 @@ public class MemberController extends NlibCommonController{
 	public @ResponseBody String changePassword(Authentication authentication,HttpServletResponse response,HttpServletRequest request,ModelMap model) throws Exception{
 		//사용자 정보를 가져온다.
 		NlibLoginVO loginVO = getNlibLoginVO(authentication);
+		
 		loginVO.setJoinCouncilCd(getCurCouncilCd(request));
 				
 		loginVO = loginService.selectLoginUserInfo(loginVO);
--- a/src/main/java/nlib/user/web/UserInfoController.java
+++ b/src/main/java/nlib/user/web/UserInfoController.java
@ -114,6 +114,7 @@ public class UserInfoController extends NlibCommonController {
 	 * 내 정보 조회
 	 * @exception Exception
 	 */
+	@Secured("ROLE_USER")
 	@RequestMapping(value="/userInfo/getMyInfo.do")
 	public String getMyInfo(HttpServletResponse response,HttpServletRequest request) throws Exception{
 		return "nlib/userInfo/getMyInfo";
@ -123,14 +124,28 @@ public class UserInfoController extends NlibCommonController {
 	 * 내 정보 수정 페이지
 	 * @exception Exception
 	 */
+	@Secured("ROLE_USER")
 	@RequestMapping(value="/userInfo/putMyInfo.do")
 	public String putMyInfo(NlibLoginVO vo,HttpServletResponse response,HttpServletRequest request,Authentication authentication,ModelMap model) throws Exception{
 		//사용자 정보를 가져온다.
 		NlibLoginVO loginVO = getNlibLoginVO(authentication);
+		
+		if(loginVO == null)
+		{
+			model.addAttribute("msg","비정상적인 접근입니다. 관리자에게 문의하여 주시기 바랍니다.");
+			model.addAttribute("url","/userInfo/pwCertMyInfo.do");
+			return "nlib/cmm/alert";
+		}
+		
 		loginVO.setJoinCouncilCd(getCurCouncilCd(request));
 		
 		loginVO = loginService.selectLoginUserInfo(loginVO);
-		
+		if(loginVO == null)
+		{
+			model.addAttribute("msg","비정상적인 접근입니다. 관리자에게 문의하여 주시기 바랍니다.");
+			model.addAttribute("url","/userInfo/pwCertMyInfo.do");
+			return "nlib/cmm/alert";
+		}
 		 
 		List<OAuthUniversalUser> snsList = new ArrayList<OAuthUniversalUser>();
 		
@ -158,6 +173,7 @@ public class UserInfoController extends NlibCommonController {
 	 * @return 
 	 * @exception Exception
 	 */
+	@Secured("ROLE_USER")
 	@RequestMapping(value="/userInfo/updateMyInfo.do" , method=RequestMethod.POST)
 	public String updateMyInfo(NlibLoginVO vo,Authentication authentication,HttpServletResponse response,HttpServletRequest request,ModelMap model) throws Exception{
 		
@ -209,6 +225,7 @@ public class UserInfoController extends NlibCommonController {
 	 * 내 정보 수정 전 password 인증
 	 * @exception Exception
 	 */
+	@Secured("ROLE_USER")
 	@RequestMapping(value="/userInfo/pwCertMyInfo.do")
 	public String pwCertMyInfo(HttpServletResponse response,HttpServletRequest request,ModelMap model) throws Exception{
 		NlibLoginVO nlibLoginVO = getNlibLoginVO(request);
--- a/src/main/resources/egovframework/mapper/nlib/user/LoginDAO_SQL.xml
+++ b/src/main/resources/egovframework/mapper/nlib/user/LoginDAO_SQL.xml
@ -37,9 +37,9 @@
 		FROM UAC_CLTR_DB.MB_INFO A /* 사용자정보 */
 		JOIN UAC_CLTR_DB.MB_SNS B  /* 사용자 SNS 정보 */
 		ON A.MB_INFO_ID = B.MB_INFO_ID 
-		WHERE B.SNS_ID = #{snsId}
-		  AND UPPER(SNS_TYPE) = UPPER(#{snsType})
+		WHERE A.MB_INFO_ID = #{mbInfoId}
 		  AND B.UNLINK_DD IS NULL /* 연동해제건 제외 */
+		  ORDER BY B.REG_DD
 		LIMIT 1	
 		]]>		
 	</select>
--- a/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp
@ -154,7 +154,6 @@
             // 출력
             $.each(jsonObj.data,function(key,obj) {
                 var t_data = "";
-                 var count = 0;
                 t_data += "<div class=\"img\"><a><img src=\"" + obj.rprsThumbUrlWithDefault + "\"</a>";
                 t_data += "<span id=\"favorites_" + obj.masterId + "\" class=\"favorites\" onclick=\"deleteInterests('single','" + obj.masterId + "');\"><img src=\"/images/icon/icon-cart-Favorites-on.png\" class=\"off\" alt=\"즐겨찾기 아이콘\"><img src=\"/images/icon/icon-cart-Favorites.png\" class=\"on\" alt=\"즐겨찾기 아이콘\"></span></div>";
                 t_data += "<div class=\"type\">"
@ -184,32 +183,55 @@
                 t_data += "</div>"
                 
                 t_data += "<div class=\"subject\">"
-                 if(!fn_isEmpty(obj.typeCodeNm))
-                 {
-                     count += 1;
-                     t_data += "<span>자료유형 : " + obj.typeCodeNm + " &#62; " + obj.dtlsTypeDivNm + "</span>"
+                 
+            	 t_data += "<span>자료유형 : "
+                 if(!fn_isEmpty(obj.typeCodeNm)){
+                     t_data += obj.typeCodeNm
                 }
-                 if(!fn_isEmpty(obj.subjectNmUp))
-                 {
-                     if(count > 0)
-                         t_data += " | ";
-                     count += 1;
-                     t_data += "<span>주제분야 : " + obj.subjectNmUp + " &#62; " + obj.subjectNm + "</span>"
+                 if(!fn_isEmpty(obj.typeCodeNm) && !fn_isEmpty(obj.dtlsTypeDivNm)){
+                     t_data += " &#62; "
                 }
-                 if(!fn_isEmpty(obj.orgNm))
-                 {
-                     if(count > 0)
-                         t_data += " | ";
-                     count += 1;
-                     t_data += "<span>생산기관 : " + obj.orgNm + "</span>"
+                 if(fn_isEmpty(obj.typeCodeNm) && fn_isEmpty(obj.dtlsTypeDivNm)){
+                     t_data += "-"
                 }
-                 if(!fn_isEmpty(obj.creatYyyy))
-                 {
-                     if(count > 0)
-                         t_data += " | ";
-                     count += 1;
-                     t_data += "<span>생산년도 : " + obj.creatYyyy + "</span>"
+                 if(!fn_isEmpty(obj.dtlsTypeDivNm)){
+                     t_data += obj.dtlsTypeDivNm
                 }
+                 t_data += "</span>"
+
+                 t_data += "&nbsp;&nbsp;|&nbsp;&nbsp;"
+                 t_data += "<span>주제분야 : "
+                 if(!fn_isEmpty(obj.subjectNmUp)){
+                	 t_data += obj.subjectNmUp
+                 }
+                 if(!fn_isEmpty(obj.subjectNmUp) && !fn_isEmpty(obj.subjectNm)){
+                	 t_data += " &#62; "
+                 }
+                 if(fn_isEmpty(obj.subjectNmUp) && fn_isEmpty(obj.subjectNm)){
+                     t_data += "-"
+                 }
+                 if(!fn_isEmpty(obj.subjectNm)){
+                	 t_data += obj.subjectNm
+                 }
+                 t_data += "</span>"
+             
+                 t_data += "&nbsp;&nbsp;|&nbsp;&nbsp;"
+                 t_data += "<span>생산기관 : "
+               	 if(!fn_isEmpty(obj.orgNm)){
+               		t_data += obj.orgNm
+                 }else{
+                	 t_data += "-" 
+                 }
+                 t_data += "</span>"
+                 
+                 t_data += "&nbsp;&nbsp;|&nbsp;&nbsp;"
+                 t_data += "<span>생산년도 : "
+             	 if(!fn_isEmpty(obj.creatYyyy)){
+             		t_data += obj.creatYyyy
+                 }else{
+                	 t_data += "-" 
+                 }
+                 t_data += "</span>"
                 t_data += "</div>"
                 
                 var t_btn  = "";
--- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp
@ -131,6 +131,52 @@ function fnSetInitialValue()
        $("#m-year-1").prop('checked',true);
    }
 }
+
+
+function goSearchNculture() {
+    
+    var form = document.createElement("form");
+    form.style.display = "none";
+    $(form).attr("action", "https://www.nculture.org/sch/totalSearchList.do");
+    $(form).attr("method", "post");
+    $(form).attr("target", "_blank");
+    
+    var collection = document.createElement("input");
+    $(collection).attr("name", "collection");
+    $(collection).attr("value","reference_Coll");
+    form.appendChild(collection);
+     
+    if(!fn_isEmpty($("#query").val()))
+    {
+    	var query = document.createElement("input");
+        $(query).attr("name", "query");
+        $(query).attr("value", $("#query").val());    
+        form.appendChild(query);
+    }
+    if(!fn_isEmpty($("#reQuery").val()))
+    {
+    	var reQuery = document.createElement("input");
+        $(reQuery).attr("name", "reQuery");
+        $(reQuery).attr("value", $("#reQuery").val());  
+        form.appendChild(reQuery);
+    }
+    if(!fn_isEmpty($("#filter_mylist").val()))
+    {
+        var filter_mylist = document.createElement("input");
+        $(filter_mylist).attr("name", "filter_mylist");
+        $(filter_mylist).attr("value", "category_A01,");
+        form.appendChild(filter_mylist);
+    }
+    
+    document.body.appendChild(form);
+    form.submit();
+    
+    document.body.removeChild(form);
+    
+    return;
+}
+
+    
 //탭 이동
 function fnTabMoveSch(collection){
    $("#collection").val(collection);
@ -443,9 +489,14 @@ function fn_search_article(pageIndex) {
                                                    </div>
                                                </c:forEach> <!-- 리스트 출력 끝부분 -->
                                                <c:if test = "${fn:length(searchVO.resultList) < 1}">
-                                                    <li class="no-result">
-                                                        <span>검색결과가 없습니다.</span>
-                                                    </li>
+                                                <div class="list resu">
+                                                    <div class="no-result">
+                                                        <p class="icon"><img src="/images/icon/icon-data-noresult.png" alt="느낌표 아이콘"></p>
+                                                        <p class="text1">검색된 결과가 없습니다</p>
+                                                        <p class="text2"><span>지역N문화</span>에서 더 많은 자료를 확인하세요!</p>
+                                                        <p class="btnbox"><button type="button" class="btn btn-color" onclick="goSearchNculture();">지역N문화에서 검색</button></p>
+                                                    </div>
+                                                </div>
                                                </c:if>
                                            </div>
                                        </div>
--- a/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp
@ -223,11 +223,11 @@ function d_search(){
 	}else{
 		$("#d_filter_creatYyyy").val("all");
 	}
-	if($("#d_query").val() != "")
+/* 	if($("#d_query").val() != "")
    {
 		filter_myList+= "search_query,";
    }
-	if($("#d_bookIndex").val() != "")
+ */	if($("#d_bookIndex").val() != "")
    {
 		filter_myList+= "search_bookIndex,";
    }
--- a/src/main/webapp/js/search/reference.js
+++ b/src/main/webapp/js/search/reference.js
@ -310,9 +310,9 @@ function fnLabel_reference(){
        }else if(mylist_arr[j].indexOf("agency") >= 0){
        	var second_cate_nm = mylist_arr[j].substring(mylist_arr[j].indexOf("_")+1);
        	$("#reference_fillter_append").append("<li>생산기관 &#62; "+ second_cate_nm + "<button type=\"button\" class=\"btn-del-filter\" id=\"" + second_cate_nm + "\" name=\"first_agency_del\" >삭제</button></li>").text();
-        }else if(mylist_arr[j].indexOf("search_query") >= 0){
+        }/*else if(mylist_arr[j].indexOf("search_query") >= 0){
 	    	$("#reference_fillter_append").append("<li>검색어 &#62; "+ $("#realQuery").val() + "<button type=\"button\" class=\"btn-del-filter detailFilter\" id=\"\" name=\"search_query\">삭제</button></li>").text();
-	    }else if(mylist_arr[j].indexOf("search_bookIndex") >= 0){
+	    }*/else if(mylist_arr[j].indexOf("search_bookIndex") >= 0){
 	    	$("#reference_fillter_append").append("<li>목차 &#62; "+ $("#bookIndex").val() + "<button type=\"button\" class=\"btn-del-filter detailFilter\" id=\"\" name=\"search_bookIndex\">삭제</button></li>").text();
 	    }else if(mylist_arr[j].indexOf("search_mngtNo") >= 0){
 	    	$("#reference_fillter_append").append("<li>관리번호 &#62; "+ $("#mngtNo").val() + "<button type=\"button\" class=\"btn-del-filter detailFilter\" id=\"\" name=\"search_mngtNo\">삭제</button></li>").text();