이지우 - 사용자 마이페이지 및 분쟁신청 작업 중

src/main/java/seed/com/user/dao/MediationDao.java

@@ -15,8 +15,10 @@ public interface MediationDao {
 	public void rceptmstUpdate(Map<String,Object> paramMap);
 	public void applcntUpdate(Map<String,Object> paramMap);
 	public void applcntDelete(Map<String,Object> paramMap);
+	public void applAllDelete(Map<String,Object> paramMap);
 	public void resUpdate(Map<String,Object> paramMap);
 	public void resDelete(Map<String,Object> paramMap);
+	public void resAllDelete(Map<String,Object> paramMap);
 	public void agentUpdate(Map<String,Object> paramMap);
 	public void rceUpdate(Map<String,Object> paramMap);
 	public void subCntrUpdate(Map<String,Object> paramMap);

src/main/java/seed/com/user/dao/MediationDaoImpl.java

@@ -66,6 +66,11 @@ public class MediationDaoImpl implements MediationDao {
 	public void applcntDelete(Map<String, Object> paramMap) {
 		sqlSession.update("mediation.applcntDelete", paramMap);
 	}
+	
+	@Override
+	public void applAllDelete(Map<String, Object> paramMap) {
+		sqlSession.delete("mediation.applAllDelete", paramMap);
+	}
 
 	@Override
 	public void resUpdate(Map<String, Object> paramMap) {
@@ -76,6 +81,11 @@ public class MediationDaoImpl implements MediationDao {
 	public void resDelete(Map<String, Object> paramMap) {
 		sqlSession.delete("mediation.resDelete", paramMap);
 	}
+	
+	@Override
+	public void resAllDelete(Map<String, Object> paramMap) {
+		sqlSession.delete("mediation.resAllDelete", paramMap);
+	}
 
 	@Override
 	public void agentUpdate(Map<String, Object> paramMap) {

src/main/java/seed/com/user/mediation/MediationService.java

@@ -52,6 +52,10 @@ public class MediationService {
 	public void applcntDelete(Map<String, Object> paramMap){
 		dao.applcntDelete(paramMap);
 	}
+	
+	public void applAllDelete(Map<String, Object> paramMap){
+		dao.applAllDelete(paramMap);
+	}
 
     public void applcntUpdate(Map<String, Object> paramMap){
         dao.applcntUpdate(paramMap);
@@ -65,6 +69,10 @@ public class MediationService {
 		dao.resDelete(paramMap);
 	}
 	
+	public void resAllDelete(Map<String, Object> paramMap){
+		dao.resAllDelete(paramMap);
+	}
+	
 	public void agentUpdate(Map<String, Object> paramMap){
 		dao.agentUpdate(paramMap);
 	}

src/main/java/seed/com/user/mediation/WebMediationController.java

@@ -247,6 +247,10 @@ public class WebMediationController {
 			String rceptNo = SeedUtils.setReplaceNull(session.getAttribute("rceptNo"));
 			String mediType = SeedUtils.setReplaceNull(paramMap.get("mediType"));
 			String fileGubun = SeedUtils.setReplaceNull(session.getAttribute("fileGubun"));
+			//마이페이지 통해서 온 경우 session의 조정유형 사용
+			if(!rceptNo.equals("") && mediType.equals("")) {
+				mediType = SeedUtils.setReplaceNull(session.getAttribute("mediType"));
+			}
 			paramMap.put("rceptNo", rceptNo);
 			paramMap.put("mediType", mediType);
 			paramMap.put("fileGubun", fileGubun);
@@ -2875,6 +2879,11 @@ public class WebMediationController {
                     String fax = fax1 + "-" + fax2 + "-" + fax3;
                     paramMap.put("fax", fax);
 
+                    String email1 = SeedUtils.setReplaceNull(paramMap.get("clientEmail1_"+i));
+                    String email2 = SeedUtils.setReplaceNull(paramMap.get("hidEmail2_"+i));
+                    String email = email1 + "@" + email2;
+                    paramMap.put("email", email);
+                    
 					paramMap.put("bizrNo", paramMap.get("bizrNo_"+i));
 					paramMap.put("cprNo", paramMap.get("cprNo_"+i));
                     service.applcntInsert(paramMap);
@@ -2902,7 +2911,199 @@ public class WebMediationController {
 			//return new ModelAndView("/_extra/web/user/mediation/mediationStep05");
 		}
 		
+		@RequestMapping("/web/user/mediation/{siteIdx}/05/{siteMenuIdx}/updateAjax04.do")
+		public ResponseEntity<?> updateAjax04(ModelMap map, HttpServletRequest request, HttpSession session,@RequestParam Map<String,Object> paramMap,
+				@PathVariable(value="siteIdx") String siteIdx,
+				@PathVariable(value="siteMenuIdx") Integer siteMenuIdx){
+			
 
+			// CI 체크
+			if(!ciCheck(map, session)) {
+				paramMap.put("sts", "fail");
+				return new ResponseEntity<>(paramMap, HttpStatus.OK);
+			}
+			/*----권한체크----*/
+			setSessionMessageRemove(session);
+			
+			Integer memberIdx = Integer.valueOf(SeedUtils.setReplaceNull(session.getAttribute("memberIdx"),"0"));
+			String memberGrant = (memberIdx == 0) ? "N" : SeedUtils.setReplaceNull(managerMemberService.getMemberMapForm(memberIdx, new String[] {"memberGrant"}).get("_memberGrant"), "N");
+			boolean memberAuthM = managerSiteManagerService.getSiteManagerListCnt(siteIdx, memberIdx);
+			boolean memberAuth = managerSiteMenuManagerService.getSiteMenuManagerListCnt(siteMenuIdx, memberIdx);
+			
+//			//메뉴 권한설정
+			
+			boolean b_ret	=	true;		
+			b_ret	=	FairnetUtils.hasUserAuth(memberIdx, memberGrant, memberAuth, session, map);
+			
+			if (!b_ret) {
+				paramMap.put("sts", "fail");
+				 return new ResponseEntity<>(paramMap, HttpStatus.OK);
+			}
+			
+			Map<Object, Object> tSiteMenuDB = managerSiteMenuService.getSiteMenuMapForm(siteMenuIdx, 
+					new String[] {"siteMenuName", "siteMenuParentTitle", "siteMenuStatus", "siteMenuType", "siteMenuLinkUrl", "siteMenuCharge", "siteMenuCharge", "siteMenuSNS", 
+					"siteMenuTitle", "siteMenuRegDate", "siteMenuModDate", "siteMenuNameType", "siteMenuIdxs", "siteMenuDepth", "siteMenuSatisfaction", "siteMenuIdx1", 
+					"tSite.siteActiveMenuWidth", "tSite.siteService", "tSite.siteServiceSdate", "tSite.siteServiceSdate"});
+			
+			if(!memberGrant.equals("S") && !memberAuthM && !memberAuth){
+				if(!SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuStatus")).equals("U")){
+					map.put("message", "common.message.no.siteMenu");
+					map.put("self", "history");
+					paramMap.put("sts", "fail");
+					 return new ResponseEntity<>(paramMap, HttpStatus.OK);
+				}
+			}
+			
+			if(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteService")).equals("Y")){
+				
+				SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+				
+				try{
+					
+					Date getDate = new Date();
+					
+					Date sDate = formatter.parse(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteServiceSdate")));
+					Date eDate = formatter.parse(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteServiceEdate")));
+					
+					if((sDate.compareTo(formatter.parse(formatter.format(getDate))) > 0 && eDate.compareTo(formatter.parse(formatter.format(getDate))) > 0) ||
+							(sDate.compareTo(formatter.parse(formatter.format(getDate))) < 0 && eDate.compareTo(formatter.parse(formatter.format(getDate))) < 0)){
+						paramMap.put("sts", "fail");
+						 return new ResponseEntity<>(paramMap, HttpStatus.OK);
+					}
+					
+				}catch(ParseException e){
+					log.error("CHECK ERROR:",e);
+				}
+			}
+			
+			if(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuType")).equals("F") || 
+					SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuType")).equals("L")){
+				paramMap.put("sts", "fail");
+				 return new ResponseEntity<>(paramMap, HttpStatus.OK);
+			}
+			
+			String siteMenuManager = "N";
+			StringBuffer siteMenuManagerIdx = new StringBuffer();
+			String siteMenuCharge = SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuCharge"), "N");
+			
+			List<Map<Object, Object>> siteMenuManagerList = 
+					managerSiteMenuManagerService.getSiteMenuManagerMapList(siteMenuIdx, new String[] {"siteMenuManagerStatus", "tMember.memberIdx"});
+			
+			for(int i=0; i<siteMenuManagerList.size(); i++){
+				
+				Map<Object, Object> tSiteMenuManagerDB = siteMenuManagerList.get(i);
+				
+				if(SeedUtils.setReplaceNull(tSiteMenuManagerDB.get("_siteMenuManagerStatus")).equals("U")){
+				
+					if(!memberIdx.equals(0) && 
+							memberIdx.equals(Integer.parseInt(SeedUtils.setReplaceNull(tSiteMenuManagerDB.get("_memberIdx"), "0"))) && 
+							siteMenuManager.equals("N")){
+						siteMenuManager = "Y";
+					}
+					siteMenuManagerIdx.append(SeedUtils.setReplaceNull(tSiteMenuManagerDB.get("_memberIdx")).toString());
+					siteMenuManagerIdx.append(",");
+				}
+			}
+			
+			if(memberGrant.equals("S") || memberAuthM){
+				siteMenuManager = "Y";
+			}
+			
+			//편집 권한
+			map.put("siteMenuManager", siteMenuManager);
+			//담당자 보기 설정
+			map.put("siteMenuCharge", siteMenuCharge);
+			//담당자 이름
+			map.put("siteMenuManagerIdx", siteMenuManagerIdx.toString());
+			//만족도 설정
+			map.put("siteMenuSatisfaction", SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuSatisfaction"), "N"));
+			
+			map.put("siteMenuSubTitle", managerSiteMenuService.getSiteMenuSubTitleForm(siteIdx, SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuIdx1"))));
+
+			String siteMenuTitle = managerSiteMenuService.getSiteMenuParentName(siteIdx, SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuIdxs")), "edit").replaceAll("》", "|") + 
+					" | " + SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuName"));
+			
+			map.put("siteMenuTitle", siteMenuTitle);
+
+			//부모메뉴 타이틀 설정한 경우 해당 글의 부모 타이틀을 가져옴
+			if(SeedUtils.setReplaceNull(tSiteMenuDB.get("_siteMenuParentTitle") ,"N").equals("Y")){
+				String[] siteMenuTitles = siteMenuTitle.split("\\|");
+				tSiteMenuDB.put("_siteMenuName", siteMenuTitles[Integer.parseInt(tSiteMenuDB.get("_siteMenuDepth").toString())-1]);
+			}
+			
+			map.put("tSiteMenuDB", tSiteMenuDB);
+			
+			map.put("memberAuthM", memberAuthM);
+			map.put("seedMenuAuth", managerGroupService.getGroupList(siteIdx, memberIdx, memberMerge, memberMergeSiteIdx));
+			/*----권한체크 종료----*/
+				
+			/*서비스 로직*/
+			try{
+				
+					
+				//접수마스터 UPDATE
+				service.rceptmstUpdate(paramMap);
+
+                //신청인정보 전부 삭제 후 다시INSERT
+				service.applAllDelete(paramMap);
+                int appCnt; 
+				if("".equals(SeedUtils.setReplaceNull(paramMap.get("appCnt")))) {
+					appCnt = 0;
+				}else {
+					appCnt = Integer.parseInt(SeedUtils.setReplaceNull(paramMap.get("appCnt")));
+				}
+                for(int i = 1; i <= appCnt; i++){
+
+                    paramMap.put("applcntCompany", paramMap.get("applcntCompany_"+i));
+                    paramMap.put("companyCeo", paramMap.get("companyCeo_"+i));
+                    paramMap.put("companyGubun", paramMap.get("companyGubun_"+i));
+                    paramMap.put("addrZip", paramMap.get("addrZip_"+i));
+                    paramMap.put("addr1", paramMap.get("addr1_"+i));
+                    paramMap.put("addr2", paramMap.get("addr2_"+i));
+                    paramMap.put("roadAddr1", paramMap.get("roadAddr1_"+i));
+                    paramMap.put("roadAddr2", paramMap.get("roadAddr2_"+i));
+
+                    String tel1 = SeedUtils.setReplaceNull(paramMap.get("tel1_"+i));
+                    String tel2 = SeedUtils.setReplaceNull(paramMap.get("tel2_"+i));
+                    String tel3 = SeedUtils.setReplaceNull(paramMap.get("tel3_"+i));
+                    String tel = tel1 + "-" + tel2 + "-" + tel3;
+                    paramMap.put("tel", tel);
+
+                    String fax1 = SeedUtils.setReplaceNull(paramMap.get("fax1_"+i));
+                    String fax2 = SeedUtils.setReplaceNull(paramMap.get("fax2_"+i));
+                    String fax3 = SeedUtils.setReplaceNull(paramMap.get("fax3_"+i));
+                    String fax = fax1 + "-" + fax2 + "-" + fax3;
+                    paramMap.put("fax", fax);
+
+                    String email1 = SeedUtils.setReplaceNull(paramMap.get("clientEmail1_"+i));
+                    String email2 = SeedUtils.setReplaceNull(paramMap.get("hidEmail2_"+i));
+                    String email = email1 + "@" + email2;
+                    paramMap.put("email", email);
+                    
+                    paramMap.put("bizrNo", paramMap.get("bizrNo_"+i));
+                    paramMap.put("cprNo", paramMap.get("cprNo_"+i));
+                    service.applcntInsert(paramMap);
+                }
+                paramMap.put("sts", "success");
+				
+			}catch (Exception e) {
+				log.error("CHECK ERROR:",e);
+				paramMap.put("sts", "fail");
+				 return new ResponseEntity<>(paramMap, HttpStatus.OK);
+			}
+			
+			map.put("rceptNo", paramMap.get("rceptNo"));
+			map.put("siteIdx", "case");
+			map.put("url", "/user/mypage/case/01/169/myMediationList.do");
+			map.put("message", "user.message.medi.temp");
+			map.put("opener", "");
+			map.put("append", "");
+			map.put("self", "");
+			
+			return new ResponseEntity<>(paramMap, HttpStatus.OK);
+			//return new ModelAndView("/_extra/web/user/mediation/mediationStep05");
+		}
+		
 		@RequestMapping("/web/user/mediation/{siteIdx}/05/{siteMenuIdx}/updateAjax04_1.do")
 		public ResponseEntity<?> updateAjax04_1(ModelMap map, HttpServletRequest request, HttpSession session,@RequestParam Map<String,Object> paramMap,
 				@PathVariable(value="siteIdx") String siteIdx,
@@ -3032,26 +3233,8 @@ public class WebMediationController {
 			/*서비스 로직*/
 			try{
 				
-				//피신청인정보 INSERT
+				//피신청인정보 삭제 후 INSERT
-				/*업데이트전 폼 삭제된 피신청인 db에서 제거*/
+				service.resAllDelete(paramMap);
-				String resDelSeq = SeedUtils.setReplaceNull(paramMap.get("resDelSeq")); 
-				String[] delSeqList = null;
-				if(!resDelSeq.equals("")){
-					delSeqList = resDelSeq.split(","); 
-					
-					for(int i = 0; i < delSeqList.length; i++){
-						System.out.println("delSeqList[i]:" + delSeqList[i]);
-						paramMap.put("seqNo", delSeqList[i]);
-						service.resDelete(paramMap);
-					}
-				}
-				
-				/*수정시 이미 존재하는 피신청인 갯수*/
-				String tempDataCnt = SeedUtils.setReplaceNull(paramMap.get("existDataCnt"));
-				int existDataCnt = 0;
-				if(!tempDataCnt.equals("")){
-					existDataCnt = Integer.parseInt(tempDataCnt); 
-				}
 				int recCnt; 
 				if("".equals(SeedUtils.setReplaceNull(paramMap.get("recCnt")))) {
 					recCnt = 0;
@@ -3084,19 +3267,7 @@ public class WebMediationController {
 					
 					paramMap.put("resBizrNo", paramMap.get("resBizrNo_"+i));
 					paramMap.put("resCprNo", paramMap.get("resCprNo_"+i));
-					//existDataCnt가 0보다 크면 피신청인 존재...UPDATE문으로
+					service.resInsert(paramMap);
-					if(existDataCnt > 0){
-						//i가existDataCnt와 같아지면 새로입력하는 피신청인
-						if(i <= existDataCnt){
-							String seqNo = (String)paramMap.get("seqNo_"+i);
-							paramMap.put("seqNo", seqNo);
-							service.resUpdate(paramMap);
-						}else{
-							service.resInsert(paramMap);
-						}
-					}else{
-						service.resInsert(paramMap);
-					}
 				}
 				
                 paramMap.put("sts", "success");

src/main/resources/egovframework/sqlmap/config/mappers/mediation/mediation_sql.xml

@@ -106,6 +106,8 @@
 			ROAD_ADDR1,
 			ROAD_ADDR2,
 			TEL,
+			EMAIL,
+			EMAIL_AGREE,
 			FAX,
 			BIZR_NO,
 			CPR_NO,
@@ -122,6 +124,8 @@
 			#{roadAddr1},
 			#{roadAddr2},
 			#{tel},
+			#{email},
+			#{emailAgree},
 			#{fax},
 			#{bizrNo},
 			#{cprNo},
@@ -397,6 +401,11 @@
 		WHERE SEQ_NO = #{seqNo}
 	</delete>
 	
+	<delete id="applAllDelete" parameterType="hashMap">
+		DELETE FROM C_APPLCNT
+		WHERE RCEPT_NO = #{rceptNo}
+	</delete>
+	
 	<update id="resUpdate" parameterType="hashMap">
 		UPDATE C_RESPONDENT
 		SET
@@ -420,6 +429,11 @@
 		WHERE SEQ_NO = #{seqNo}
 	</delete>
 	
+	<delete id="resAllDelete" parameterType="hashMap">
+		DELETE FROM C_RESPONDENT
+		WHERE RCEPT_NO = #{rceptNo}
+	</delete>
+	
 	<update id="agentUpdate" parameterType="hashMap">
 		UPDATE C_APPAGENT
 		SET

src/main/resources/egovframework/sqlmap/config/mappers/mypage/mypage_sql.xml

@@ -147,7 +147,8 @@
 				FAX,
 				BIZR_NO,
 				CPR_NO,
-				FILE_NO
+				FILE_NO,
+				EMAIL
 	    FROM C_APPLCNT
 		WHERE RCEPT_NO = #{rceptNo}
 		ORDER BY

src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04.jsp

@@ -14,7 +14,7 @@
 <script type="text/javascript">
 	$(document).ready(function(){
 	    addTabB();			// 신청인 등록폼 추가
-	    delTabB();
+	    /* delTabB(); */
 	});
 	
 	//신청인 추가
@@ -112,9 +112,6 @@
 	        mark += "              <li>";
 	        mark += "                <button type='button' class='btn btn_text darkblue_border btn_40' onclick='goJuso(\"A_" + areaCount2 + "\");'>우편번호검색</button>";
 	        mark += "              </li>";
-	        mark += "              <li>";
-	        mark += "                <input type='checkbox' id='s_foreignCountry' name='s_foreignCountry-" + areaCount2 + "' value='Y' class='checkbox'><label for='s_foreignCountry'>해외시 체크해주세요.</label>";
-	        mark += "              </li>";
 	        mark += "            </ul>";
 	        mark += "            <p class='cf_text small color_red'>*우편물(공문)을 수령할 수 있는 자택/사업장 주소를 기입 바랍니다.</p>";
 	        mark += "          </td>";
@@ -1009,8 +1006,8 @@
 		if($("#s_foreignCountry-1").is(":checked") == true){
 			var f = document.applyForm;
 			f.addrZip_1.value="기타";
-			f.addr1_1.value="기타";
+			/* f.addr1_1.value="기타";
-			f.addr2_1.value="기타";
+			f.addr2_1.value="기타"; */
 			f.roadAddr1_1.value="기타";
 			f.roadAddr2_1.value="기타";
 		}
@@ -1020,7 +1017,7 @@
 		/* var frmAction = "/web/user/mediation/${siteIdx}/05/${siteMenuIdx}/writeAjax.do" */;
 		var frmAction = "/web/user/mediation/${siteIdx}/05/${siteMenuIdx}/writeAjax04.do";
 		if(document.applyForm.rceptNo.value != ''){
-			var frmAction = "/web/user/mediation/${siteIdx}/05/${siteMenuIdx}/updateAjax.do";
+			var frmAction = "/web/user/mediation/${siteIdx}/05/${siteMenuIdx}/updateAjax04.do";
 // 			$("#applyForm").attr("action", frmAction);
 		}
 	
@@ -1682,10 +1679,11 @@
 			<c:when test="${not empty applcntData}">
 				<input type="hidden" name="appCnt" id="appCnt" value="${fn:length(applcntData)}">
 				
-				<c:forEach items="${applcntData}" var="appData" varStatus="sts">
+
-					<input type="hidden" id="seqNo2_<c:out value='${sts.index+1}'/>" name="seqNo2_<c:out value='${sts.index+1}'/>" value="<c:out value='${appData.SEQ_NO}'/>">
 					
 					<ul class="apl_list subTab_b_wrap">
+					<c:forEach items="${applcntData}" var="appData" varStatus="sts">
+					<input type="hidden" id="seqNo2_<c:out value='${sts.index+1}'/>" name="seqNo2_<c:out value='${sts.index+1}'/>" value="<c:out value='${appData.SEQ_NO}'/>">
 						<li class="subTab_b outerBoxB${sts.count}"">
 							<div class="apl_title">
 								<button type="button" class="btn_apl_slide" onclick="aplSlide(this);">
@@ -1740,9 +1738,11 @@
 													<li>
 														<button type="button" class="btn btn_text darkblue_border btn_40" onclick="goJuso('A_${sts.index+1}');">우편번호검색</button>
 													</li>
-													<li>
+													<c:if test="${sts.count eq '1'}">
-														<input type="checkbox" id="s_foreignCountry" name="s_foreignCountry-1" value="Y" class="checkbox"  <c:if test='${appData.ZIP eq "기타"}'>checked</c:if>><label for="s_foreignCountry">해외시 체크해주세요.</label>
+														<li>
-													</li>
+															<input type="checkbox" id="s_foreignCountry-1" name="s_foreignCountry-1" value="Y" class="checkbox"  <c:if test='${appData.ZIP eq "기타"}'>checked</c:if>><label for="s_foreignCountry">해외시 체크해주세요.</label>
+														</li>
+													</c:if>
 												</ul>
 												<p class="cf_text small color_red">*우편물(공문)을 수령할 수 있는 자택/사업장 주소를 기입 바랍니다.</p>
 											</td>
@@ -1896,8 +1896,8 @@
 								</table>
 							</div>
 						</li>
+						</c:forEach>
 					</ul>
-				</c:forEach>
 			</c:when>
 			<c:otherwise>
 				<input type="hidden" name="appCnt" id="appCnt" value="1">
@@ -1956,7 +1956,7 @@
 													<button type="button" class="btn btn_text darkblue_border btn_40" onclick="goJuso('A_${sts.index+1}');">우편번호검색</button>
 												</li>
 												<li>
-													<input type="checkbox" id="s_foreignCountry" name="s_foreignCountry-1" value="Y" class="checkbox" ><label for="s_foreignCountry">해외시 체크해주세요.</label>
+													<input type="checkbox" id="s_foreignCountry-1" name="s_foreignCountry-1" value="Y" class="checkbox" ><label for="s_foreignCountry">해외시 체크해주세요.</label>
 												</li>
 											</ul>
 											<p class="cf_text small color_red">*우편물(공문)을 수령할 수 있는 자택/사업장 주소를 기입 바랍니다.</p>

src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04_1.jsp

@@ -112,10 +112,6 @@
 		        mark += '                            <li>';
 		        mark += '                                <button type="button" class="btn btn_text darkblue_border btn_40 btn_in_tbl" onclick="goJuso(\'' + areaCount + '\');">우편번호 검색</button>';
 		        mark += '                            </li>';
-		        mark += '                            <li>';
-		        mark += '                                <input type="checkbox" id="res_foreignCountry-' + areaCount + '" name="res_foreignCountry-' + areaCount + '" value="Y" >';
-		        mark += '                                <label for="res_foreignCountry-' + areaCount + '">해외시 체크해주세요.</label>';
-		        mark += '                            </li>';
 		        mark += '                        </ul>';
 		        mark += '                    </td>';
 		        mark += '                </tr>';
@@ -367,7 +363,7 @@
 	}
 
 	// 개인/법인(회사구분)
-	function cpGubunCombo2(appCnt){
+	function cpGubunCombo2(resCnt){
 		var url = "";
 		$("#type").val("L");
 		//var param = jQuery('#applyForm').serialize();
@@ -377,7 +373,7 @@
 
 			var sel = "";
 
-			var objList = $("#companyGubun_"+appCnt);
+			var objList = $("#resGubun_"+resCnt);
 			ajaxCombo(r.data, objList, sel);
 		});
 	}
@@ -503,7 +499,7 @@
 
 	/*마이페이지에서 수정으로 넘어올경우 셋팅*/
 
-		var appDataNumber = Number('${fn:length(applcntData)}');
+		var appDataNumber = Number('${fn:length(respondentData)}');
 		if(appDataNumber > 0){
 			/*마이페이지에서 수정으로 넘어왔을때 피신청인 셋팅*/
 			for(var j = 0; j < appDataNumber; j++){
@@ -605,7 +601,7 @@
 
 			<c:if test="${not empty applcntData}">
 				<c:forEach items="${applcntData}" var="rs2" varStatus="stt">
-				var list = $("#companyGubun_"+ "${stt.index+1}" +" option");
+				var list = $("#resGubun_"+ "${stt.index+1}" +" option");
 				for(var i = 0; i < list.size(); i++){
 					if(list[i].value == '${rs2.COMPANY_GUBUN}'){
 						$(list[i]).attr("selected", true);
@@ -1248,10 +1244,10 @@
 										</tr>
 										<tr>
 											<th>
-												<p class="required_text">*<span>필수입력</span></p>개인/법인
+												<p class="required_text">*<span>필수입력</span></p>개인/법인1
 											</th>
 											<td colspan="3">
-												<select name="resGunbun_<c:out value='${status.index+1}'/>" id="resGunbun_<c:out value='${status.index+1}'/>" class="select resGunbun" title="개인/법인 선택">
+												<select name="resGunbun_<c:out value='${sts.count}'/>" id="resGunbun_<c:out value='${sts.count}'/>" class="select resGunbun" title="개인/법인 선택">
 													<option value="">선택하세요</option>
 												</select>
 											</td>
@@ -1268,10 +1264,12 @@
 													<li>
 														<button type="button" class="btn btn_text darkblue_border btn_40 btn_in_tbl" onclick="goJuso('${status.index+1}');">우편번호 검색</button>
 													</li>
-													<li>
+													<c:if test="${sts.count eq '1'}">
-														<input type="checkbox" id="res_foreignCountry-<c:out value='${status.index+1}'/>" name="res_foreignCountry-<c:out value='${status.index+1}'/>" value="Y" <c:if test='${data.ZIP eq "기타"}'>checked</c:if>>
+														<li>
-														<label for="res_foreignCountry-<c:out value='${status.index+1}'/>">해외시 체크해주세요.</label>
+															<input type="checkbox" id="res_foreignCountry-<c:out value='${status.index+1}'/>" name="res_foreignCountry-<c:out value='${status.index+1}'/>" value="Y" <c:if test='${data.ZIP eq "기타"}'>checked</c:if>>
-													</li>
+															<label for="res_foreignCountry-<c:out value='${status.index+1}'/>">해외시 체크해주세요.</label>
+														</li>
+													</c:if>
 												</ul>
 											</td>
 										</tr>
@@ -1450,7 +1448,7 @@
 													<button type="button" class="btn btn_text darkblue_border btn_40" onclick="goJuso('1');">우편번호검색</button>
 												</li>
 												<li>
-													<input type="checkbox" id="res_foreignCountry-1" name="res_foreignCountry-1" value="Y" class="checkbox" ><label for="res_foreignCountry-1">해외시 체크해주세요.</label>
+													<input type="checkbox" id="res_foreignCountry-1" name="res_foreignCountry-1" value="Y" class="checkbox" ><label for="res_foreignCountry-1"> 체크해주세요.</label>
 												</li>
 											</ul>
 											<p class="cf_text small color_red">*우편물(공문)을 수령할 수 있는 자택/사업장 주소를 기입 바랍니다.</p>