diff --git a/src/main/java/nlib/sch/web/NlibSearchController.java b/src/main/java/nlib/sch/web/NlibSearchController.java index a0fadd97..c4d27087 100644 --- a/src/main/java/nlib/sch/web/NlibSearchController.java +++ b/src/main/java/nlib/sch/web/NlibSearchController.java @@ -225,7 +225,7 @@ public class NlibSearchController extends NlibCommonController { } secondClassList.get(i).put("cnt", Integer.toString(count)); } - // CSRF 토큰 생성 (2021.12.02 KKN 추가) + // CSRF 토큰 생성 String token = generateCsrfToken(request); model.addAttribute("csrfToken", token); @@ -374,10 +374,6 @@ public class NlibSearchController extends NlibCommonController { imagePath = StringUtil.getString(vo.getRprsThumbUrl(),""); } - // CSRF 토큰 생성 (2021.12.02 KKN 추가) - String token = generateCsrfToken(request); - model.addAttribute("csrfToken", token); - model.addAttribute("imageType",imageType); model.addAttribute("imagePath",imagePath); model.addAttribute("keywordList",keywordList); @@ -473,7 +469,7 @@ public class NlibSearchController extends NlibCommonController { model.addAttribute("firstClassList", codeService.listCodes(Constant.CODE_ID_MASTER_TYPE_DIV_CD)); model.addAttribute("secondClassList", codeService.listCodes(Constant.CODE_ID_DTLS_TYPE_DIV_CD)); - // CSRF 토큰 생성 (2021.12.02 KKN 추가) + // CSRF 토큰 생성 String token = generateCsrfToken(request); model.addAttribute("csrfToken", token); return "nlib/search/getDetailedSearchFormPopup"; diff --git a/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml index abcbf9c8..9e64988c 100644 --- a/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml @@ -28,6 +28,7 @@ AND RM.REG_STATUS = 'REG_OK' AND RM.OPER_READ_RANGE_CD != '03' /* 전체열람, 목록열람으로 한정 : 열람불가 제외 */ ) T + WHERE KEY_NAME != '-' GROUP BY T.KEY_NAME ORDER BY CNT DESC, T.KEY_NAME LIMIT 20 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 a04c9598..6e0ed780 100644 --- a/src/main/resources/egovframework/mapper/nlib/col/InterestDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/col/InterestDAO_SQL.xml @@ -101,8 +101,6 @@ WHERE 1=1 AND SD.USE_YN = "Y" AND SD.CLOSE_FLAG = "0" - AND IFNULL(NULLIF(SD.APPLY_START_YMD,''),"99999999") < date_format(NOW(), '%Y%m%d') - AND IFNULL(NULLIF(SD.APPLY_CLOSE_YMD,''),"99999999") > date_format(NOW(), '%Y%m%d') AND MI.USE_YN = "Y" AND MI.MB_INFO_ID = #{mbInfoId} GROUP BY ORG_CD,DEPT_NM diff --git a/src/main/webapp/WEB-INF/jsp/nlib/member/alreadySignUpPopup.jsp b/src/main/webapp/WEB-INF/jsp/nlib/member/alreadySignUpPopup.jsp index 33674fdf..9c4e6b23 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/member/alreadySignUpPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/member/alreadySignUpPopup.jsp @@ -1,3 +1,28 @@ +<% +/** + *
+ * @Class Name : alreadySignUpPopup.jsp + * + * @Description : 계정통합팝업 + * + * + * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021) + * + *+ * + * @ ------------ -------- --------------------------- + * @ 수정일 수정자 수정내용 + * @ ------------ -------- --------------------------- + * @ 2021. 9. 9. JSYOO 최초 생성 + * + * + * @author 이씨플라자 * DIGITALSHIP JSYOO + * @since 2021. 9. 9. + * @version 1.0 + * + */ + %> + <%@ page language="java" contentType="text/html; charset=UTF-8" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> @@ -14,6 +39,8 @@ $(document).ready(function(){ window.close(); } + + <%//비밀번호 찾기 페이지에서 다시 돌아왔을 경우 %> var previousPage = "${vo.previousPage}"; if(previousPage == "alreadySignUpPopup") @@ -24,6 +51,18 @@ $(document).ready(function(){ } }); +function notMe() +{ + $("#alreadySignUpChk").val('Y'); + gfn_closeLayerPopup(); + + if($("#linkType").val() == "signUp") + { + setTimeout(goSignUp, 100); + } +} + + function selectAccount(mbInfoId,name,email) { $("#alreadySingUpForm").css("display","none"); @@ -96,7 +135,7 @@ function accountLink() @@ -107,7 +146,7 @@ function accountLink() - +
- * @Class Name : snsCertForm.jsp - * - * @Description : 회원가입 SNS 인증 - * - * - * @프로젝트명: 지방문화원 통합자료관리시스템 구축사업 (2021) - * - *- * - * @ ------------ -------- --------------------------- - * @ 수정일 수정자 수정내용 - * @ ------------ -------- --------------------------- - * @ 2021. 7. 12. JSYOO 최초 생성 - * - * - * @author 이씨플라자 * DIGITALSHIP JSYOO - * @since 2021. 7. 12. - * @version 1.0 - * - */ - %> -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<% /** *
* @Class Name : snsCertForm.jsp
diff --git a/src/main/webapp/js/nlib.js b/src/main/webapp/js/nlib.js
index 09d75d92..01db09e3 100644
--- a/src/main/webapp/js/nlib.js
+++ b/src/main/webapp/js/nlib.js
@@ -244,7 +244,7 @@ function gfn_changeInterestBtn(masterId,onOff){
data: {"masterId" : masterId}
}).done(function(result){
alert(result);
- if(result == "로그인 후 이용하실 수 있습니다.")
+ if(result == "로그인 후, 이용하실 수 있습니다.")
{
return false;
}
@@ -263,7 +263,7 @@ function gfn_changeInterestBtn(masterId,onOff){
data : {"masterIdList" : masterIdArray},
success : function(result){
alert(result);
- if(result == "로그인 후 이용하실 수 있습니다.")
+ if(result == "로그인 후, 이용하실 수 있습니다.")
{
return false;
}