tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'advc' of http://yickso@vcs.iten.co.kr:9999/hylee/offedu into advc

Browse Source
This commit is contained in:
kmg 2024-02-16 15:11:25 +09:00
commit a8a6587a2f
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java
View File

@ -486,15 +486,26 @@ public class FndtnEnhanceTrnController {
LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기
SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기
/*
if (loginVO == null || ssoLoginVO == null) {
//이전 url 처리(beforeSiteUrl)_이준호_220228추가
return checkLoginUtil.getUserLoginPage(model, request); //로그인 정보가 없으면 로그인 페이지로 이동한다.
}
}
*/
//1.pageing step1
//과정 조회
VEPrcsDetailVO vEPrcsDetailVODetail = vEPrcsAplctPrdService.selectDetailNewOne4Fndth(vEPrcsDetailVO);
VEEduAplctVO vEEduAplctReqVO = new VEEduAplctVO();
vEEduAplctReqVO.setUserId(loginVO.getUniqId());
try {
vEEduAplctReqVO.setUserId(loginVO.getUniqId());
model.addAttribute("userSe", "Y");
}catch(Exception ex) {
model.addAttribute("userSe", "N");
ex.printStackTrace();
}
vEEduAplctReqVO.setLctrDivCd(vEPrcsDetailVODetail.getLctrDivCd());
vEEduAplctReqVO.setPrcsAplctPrdOrd(vEPrcsDetailVODetail.getPrcsAplctPrdOrd());
vEEduAplctReqVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_50);

2
src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml
View File

@ -579,7 +579,7 @@
a.title AS title ,
(SELECT user_nm
FROM comvnusermaster
WHERE esntl_id = a.frst_register_id
WHERE esntl_id = a.frst_register_id LIMIT 1
)
AS frstRegisterNm ,
(SELECT orignl_file_nm

5
src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp
View File

@ -174,6 +174,11 @@
var data ={
"prcsAplctPrdOrd": prcsAplctPrdOrd
}
if ('${userSe}'=='N'){
alert("로그인 후 신청가능합니다.");
return;
}
commonPopLayeropen(
"${pageContext.request.contextPath}/web/ve/aplct/fndtnEnhanceTrn/eduAplctPop.do"