From 1dfa0ce825c882c164d1a38540c911413ba4867e Mon Sep 17 00:00:00 2001
From: rosewiper <rosehips@naver.com>
Date: Wed, 27 Dec 2023 12:55:31 +0900
Subject: [PATCH] =?UTF-8?q?=EC=84=B8=EA=B8=88=EA=B3=84=EC=82=B0=EC=84=9C?=
 =?UTF-8?q?=20=EC=9E=90=EB=8F=99=EB=B0=9C=ED=96=89=20=EA=B8=B0=EB=8A=A5=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20=20-=20=EA=B0=9C?=
 =?UTF-8?q?=EC=9D=B8=20=ED=9A=8C=EC=9B=90=20=ED=9B=84=EB=B3=B4=EC=9E=90?=
 =?UTF-8?q?=EB=93=B1=EB=A1=9D=20=EC=A0=95=EB=B3=B4=EA=B0=80=20=EC=97=86?=
 =?UTF-8?q?=EB=8A=94=20=EA=B2=BD=EC=9A=B0=20=EC=84=B8=EA=B8=88=EA=B3=84?=
 =?UTF-8?q?=EC=82=B0=EC=84=9C=20=EC=9E=90=EB=8F=99=EB=B0=9C=ED=96=89=20?=
 =?UTF-8?q?=EC=A0=80=EC=9E=A5=20=EC=8B=9C=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=20-=20=EC=9E=90=EB=8F=99=20=EB=B0=9C=ED=96=89=20?=
 =?UTF-8?q?=EC=A0=80=EC=9E=A5=20=ED=9B=84=20=ED=99=94=EB=A9=B4=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=EC=9E=90=EB=8F=99=EB=B0=9C=ED=96=89=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=ED=91=9C=EC=8B=9C=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/itn/let/mjo/pay/web/MjonPayController.java | 6 ++++--
 .../itn/let/uss/umt/web/EgovUserManageController.java    | 2 --
 src/main/webapp/WEB-INF/jsp/web/pay/BillPub.jsp          | 9 +++++++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java
index 3664c25d..99f05b15 100644
--- a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java
+++ b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java
@@ -3844,9 +3844,11 @@ public class MjonPayController {
 	    	MberManageVO tmpMberManageVO = mjonMsgDataService.selectMberManageInfo(mberId);
 	    	String dept = tmpMberManageVO.getDept();
 	    	
-	    	if(dept.equals("p") && taxCNm != null && taxCNm.length() > 0) {
+	    	//후보자 정보 조회
+	    	MjonCandidateVO mjonCandidateVO = mjonCandidateService.selectCandidateDataInfo(mberId);
+	    	
+	    	if(mjonCandidateVO != null && dept.equals("p") && taxCNm != null && taxCNm.length() > 0) {
 	    		
-	    		MjonCandidateVO mjonCandidateVO = mjonCandidateService.selectCandidateDataInfo(mberId);
 	    		String candidateNm = mjonCandidateVO.getCandidateNm();
 	    		if(candidateNm != null && candidateNm.length() > 0) {
 	    			
diff --git a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java
index c0916816..c367dd89 100644
--- a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java
+++ b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java
@@ -2717,8 +2717,6 @@ public class EgovUserManageController {
         		
         		MberManageVO mberManageVO = mberManageService.selectMber(userManageVO.getMberId());
         		
-        		System.out.println(mberManageVO.getTaxbillAuto());
-        		
         		String taxbillAuto = mberManageVO.getTaxbillAuto();
         		
         		if(taxbillAuto == null || taxbillAuto.equals("N")) {
diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/BillPub.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/BillPub.jsp
index 6966bde3..bd5735aa 100644
--- a/src/main/webapp/WEB-INF/jsp/web/pay/BillPub.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/pay/BillPub.jsp
@@ -23,6 +23,7 @@
 
 	<script type="text/javaScript" language="javascript">
 	$( document ).ready(function() {
+		
 		//현금영수증 사업자번호 넣어주기
 		if("${mberManageVO.cashbillBizNo}" != ""){
 			//사업자번호 - 넣어주기
@@ -452,6 +453,10 @@
 	
 	$(window).on('load',function(){
 		$('.bill_content_wrap .bill_content').eq(0).show();
+		
+		var billDept = $("input[name=billDepth]:checked");
+		billDepth(billDept);
+		
 	});
 	
 	function billDepth(obj){
@@ -505,8 +510,8 @@
                     <div class="pay_cont current" id="tab1_1">
                         <div class="bill_tab">
                         	<ul>
-                        		<li><input type="radio" name="billDepth" id="billDepth1" checked="checked" onchange="billDepth(this);" value="biz" /><label for="billDepth1">기업</label></li>
-                        		<li><input type="radio" name="billDepth" id="billDepth2" onchange="billDepth(this);" value="regi" /><label for="billDepth2">개인</label></li>
+                        		<li><input type="radio" name="billDepth" id="billDepth1" <c:if test="${mberManageVO.taxbillAuto eq 'B'}">checked="checked"</c:if> onchange="billDepth(this);" value="biz" /><label for="billDepth1">기업</label></li>
+                        		<li><input type="radio" name="billDepth" id="billDepth2" <c:if test="${mberManageVO.taxbillAuto eq 'C'}">checked="checked"</c:if> onchange="billDepth(this);" value="regi" /><label for="billDepth2">개인</label></li>
                         	</ul>
                         	<p>* 자동 발행은 기업/개인 중에 한 곳만 가능합니다.</p>
                         </div>