Merge branch 'sowon' into develop

src/main/java/com/style24/front/biz/web/TsfPlanningController.java

@@ -424,6 +424,13 @@ public class TsfPlanningController extends TsfBaseController {
 	@GetMapping("/event/poll/form")
 	public ModelAndView planningEventPollSave(Plan plan) {
 		ModelAndView mav = new ModelAndView();
+		// 로그인 안 한 경우
+		if (!TsfSession.isLogin()) {
+			mav.addObject("inaccessibleMsg", "로그인 후 참여 가능합니다.");
+			mav.setViewName(super.getDeviceViewName("error/Inaccess"));
+			return mav;
+		}
+		
 		Poll poll = new Poll();
 		plan.setSiteCd(TscConstants.Site.STYLE24.value());
 		plan.setCustNo(TsfSession.getInfo().getCustNo());
@@ -431,7 +438,8 @@ public class TsfPlanningController extends TsfBaseController {
 		poll = planningService.getPollQuestionInfo(plan);                 
 		String partYn = poll.getDupPartiYn();                             
 		String comYn = poll.getFstComYn();                                
-		int partiCnt = poll.getPartiCnt();   
+		int partiCnt = poll.getPartiCnt();  
+		
 		// 중복참여가 아닌경우                                                     
 		if(partYn.equals("N")) {                                          
 			int count = planningService.getCustAnswerCount(plan);

src/main/webapp/WEB-INF/views/web/planning/PlanningDetailFormWeb.html

@@ -731,11 +731,7 @@ var fnPlanCouponCallBack = function(result){
 // 설문조사 참여 버튼 클릭
 var fnJoinConfirm = function () {
 	let planSq = plan.planSq;
-	// 로그인 확인
-	if (!cfCheckLogin()) {
-		mcxDialog.alert("로그인 후 참여 가능합니다.");
-		return false;
-	}
+	
 	cfnGoToPollDetail(planSq);
 
 }