From ecbaed9a39cfb7f47e3fef072ee49797f0db3066 Mon Sep 17 00:00:00 2001 From: myname Date: Mon, 20 Jan 2025 14:04:45 +0900 Subject: [PATCH] # WARNING: head commit changed in the meantime MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/itnAdmin/fairnet 재심의 기안 오류 수정 --- .../seed/com/gtm/base/GwBaseController.java | 2 +- .../_extra/gtm/trublprocessmng/rceptEdit.jsp | 20 +++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/main/java/seed/com/gtm/base/GwBaseController.java b/src/main/java/seed/com/gtm/base/GwBaseController.java index c6a02cf9..895ba22e 100644 --- a/src/main/java/seed/com/gtm/base/GwBaseController.java +++ b/src/main/java/seed/com/gtm/base/GwBaseController.java @@ -4883,7 +4883,7 @@ v_ret = this.receiverHeader(); String v_ret = ""; try { -v_ret = this.receiverHeader(); +//v_ret = this.receiverHeader(); //수신영역 { diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp index fb4e45a6..d837c2e1 100644 --- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp +++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublprocessmng/rceptEdit.jsp @@ -3672,7 +3672,8 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4, || jobID=='1-27' //자료요구(피신청인)3차 || jobID=='1-7' //출석요구(피신청인)1차 || jobID=='1-8' //출석요구(피신청인)2차 - || jobID.indexOf('1-4')>-1 //추가통지1차~5차(41~45) + || (jobID.indexOf('1-4')>-1 //추가통지1차~5차(41~45) + && jobID!='1-40') || jobID.indexOf('1-14')>-1 //조정절차종료사실통지 || jobID=='1-15' @@ -3703,7 +3704,8 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4, || jobID=='2-27' //자료요구(피신청인)3차 || jobID=='2-7' //출석요구(피신청인)1차 || jobID=='2-8' //출석요구(피신청인)2차 - || jobID.indexOf('2-4')>-1 //추가통지1차~5차(41~45) + || (jobID.indexOf('2-4')>-1 //추가통지1차~5차(41~45) + && jobID!='2-40') || jobID.indexOf('2-14')>-1 //조정절차종료사실통지 || jobID=='2-15' @@ -3734,7 +3736,8 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4, || jobID=='3-27' //자료요구(피신청인)3차 || jobID=='3-7' //출석요구(피신청인)1차 || jobID=='3-8' //출석요구(피신청인)2차 - || jobID.indexOf('3-4')>-1 //추가통지1차~5차(41~45) + || (jobID.indexOf('3-4')>-1 //추가통지1차~5차(41~45) + && jobID!='3-40') || jobID.indexOf('3-14')>-1 //조정절차종료사실통지 || jobID=='3-15' @@ -3764,7 +3767,8 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4, || jobID=='4-27' //자료요구(피신청인)3차 || jobID=='4-7' //출석요구(피신청인)1차 || jobID=='4-8' //출석요구(피신청인)2차 - || jobID.indexOf('4-4')>-1 //추가통지1차~5차(41~45) + || (jobID.indexOf('4-4')>-1 //추가통지1차~5차(41~45) + && jobID!='4-40') || jobID.indexOf('4-14')>-1 //조정절차종료사실통지 || jobID=='4-15' @@ -3794,7 +3798,8 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4, || jobID=='5-27' //자료요구(피신청인)3차 || jobID=='5-7' //출석요구(피신청인)1차 || jobID=='5-8' //출석요구(피신청인)2차 - || jobID.indexOf('5-4')>-1 //추가통지1차~5차(41~45) + || (jobID.indexOf('5-4')>-1 //추가통지1차~5차(41~45) + && jobID!='5-40') || jobID.indexOf('5-14')>-1 //조정절차종료사실통지 || jobID=='5-15' @@ -3824,7 +3829,8 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4, || jobID=='6-27' //자료요구(피신청인)3차 || jobID=='6-7' //출석요구(피신청인)1차 || jobID=='6-8' //출석요구(피신청인)2차 - || jobID.indexOf('6-4')>-1 //추가통지1차~5차(41~45) + || (jobID.indexOf('6-4')>-1 //추가통지1차~5차(41~45) + && jobID!='6-40') || jobID.indexOf('6-14')>-1 //조정절차종료사실통지 || jobID=='6-15' @@ -3903,6 +3909,8 @@ function nanumApi(jobID, codeNo, nanumSubject, obj1, obj2, obj3, obj4, //$("#nanumViewFrm #subjectStrView").val(r.title); //그룹웨어로그인아이디 $("#nanumViewFrm #contentsStrView").val(r.contents); + + //alert(r.title+":"+r.gwId+":"+r.contents); //$("#subjectStrImsi").val(r.title); //그룹웨어로그인아이디 //$("#contentsStrImsi").val(r.contents);