diff --git a/src/main/java/itn/let/sym/grd/web/MberGrdController.java b/src/main/java/itn/let/sym/grd/web/MberGrdController.java
index 1860a1f6..f5d632ea 100644
--- a/src/main/java/itn/let/sym/grd/web/MberGrdController.java
+++ b/src/main/java/itn/let/sym/grd/web/MberGrdController.java
@@ -92,7 +92,7 @@ public class MberGrdController {
try{
MberGrdVO mberGrdVO1 = new MberGrdVO();
mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
- if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) {
+ if (mberGrdVO1.getGrdNoti().equals("Y")) {
isSuccess = true;
}
}
@@ -127,17 +127,22 @@ public class MberGrdController {
if (StringUtils.isNotEmpty(userId)) {
mberGrdVO.setMberId(userId);
- // 회원별 이벤트 진행여부
- int mberEventPrgCnt = mberGrdService.selectMberEventPrgCnt(mberGrdVO.getMberId());
- if (mberEventPrgCnt == 0) {
- rtnMberGrdVO = mberGrdService.selectMberGrdInfo(mberGrdVO.getMberId());
- if (null != rtnMberGrdVO) {
- isSuccess = true;
- }
- else {
- msg = "종료";
- }
- }
+ // Step 1. 등급제 시행 ON 일경우(시행일자 진행여부 Y일경우)
+ MberGrdVO mberGrdVO1 = new MberGrdVO();
+ mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
+ if (mberGrdVO1.getGrdNoti().equals("Y")) {
+ // Step 2. 회원별 이벤트 진행여부
+ int mberEventPrgCnt = mberGrdService.selectMberEventPrgCnt(mberGrdVO.getMberId());
+ if (mberEventPrgCnt == 0) {
+ rtnMberGrdVO = mberGrdService.selectMberGrdInfo(mberGrdVO.getMberId());
+ if (null != rtnMberGrdVO) {
+ isSuccess = true;
+ }
+ else {
+ msg = "종료";
+ }
+ }
+ }
}
}
catch(Exception e) {
diff --git a/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java b/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java
index 99664375..66971f04 100644
--- a/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java
+++ b/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java
@@ -182,7 +182,7 @@ public class MberGrdMngController {
// Step 1. 등급제 시행 ON 일경우
MberGrdVO mberGrdVO1 = new MberGrdVO();
mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
- if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) {
+ if (mberGrdVO1.getGrdNoti().equals("Y")) {
mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate());
// 회원별 등급 초기화
@@ -318,24 +318,26 @@ public class MberGrdMngController {
// 로그인VO에서 사용자 정보 가져오기
LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
- String frstRegisterId = loginVO == null ? "" : loginVO.getId();
- mberGrdVO.setEditId(frstRegisterId); // 최초등록자ID
-
- try{
- rtnMberGrdVO = mberGrdService.selectMberGrdInfo(mberGrdVO.getMberId());
- if (null != rtnMberGrdVO) {
- // 등급제 적용
-
- }
- else {
- isSuccess = false;
- msg = "종료";
- }
- }
- catch(Exception e) {
- isSuccess = false;
- msg = e.getMessage();
- }
+ if (loginVO != null) {
+ String frstRegisterId = loginVO == null ? "" : loginVO.getId();
+ mberGrdVO.setEditId(frstRegisterId); // 최초등록자ID
+
+ try{
+ rtnMberGrdVO = mberGrdService.selectMberGrdInfo(mberGrdVO.getMberId());
+ if (null != rtnMberGrdVO) {
+ // 등급제 적용
+
+ }
+ else {
+ isSuccess = false;
+ msg = "종료";
+ }
+ }
+ catch(Exception e) {
+ isSuccess = false;
+ msg = e.getMessage();
+ }
+ }
modelAndView.addObject("rtnMberGrdVO", rtnMberGrdVO);
modelAndView.addObject("isSuccess", isSuccess);
@@ -433,7 +435,7 @@ public class MberGrdMngController {
// Step 1. 등급제 시행 ON 일경우
MberGrdVO mberGrdVO1 = new MberGrdVO();
mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
- if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) {
+ if (mberGrdVO1.getGrdNoti().equals("Y")) {
mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate());
// 회원 등급 변경(환불후) => 기존등급 상관없이 업데이트
diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
index 967dd730..a7e9ea54 100644
--- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
@@ -101,8 +101,37 @@ $(document).ready(function (){