diff --git a/src/main/resources/egovframework/sqlmap/config/mappers/trublreqstmng/trublreqstmng_sql.xml b/src/main/resources/egovframework/sqlmap/config/mappers/trublreqstmng/trublreqstmng_sql.xml
index 42a67bc1..411454e7 100644
--- a/src/main/resources/egovframework/sqlmap/config/mappers/trublreqstmng/trublreqstmng_sql.xml
+++ b/src/main/resources/egovframework/sqlmap/config/mappers/trublreqstmng/trublreqstmng_sql.xml
@@ -132,11 +132,8 @@
AND A.STATE = '0302000000'
AND A.PRESIDENT_ASSIGN IS NOT NULL
AND A.PRESIDENT_ASSIGN_DT IS NOT NULL
- AND A.SCCHF_ASSIGN IS NOT NULL
- AND A.SCCHF_ASSIGN_DT IS NOT NULL
-
- AND A.TIMHDER_ASSIGN IN ('1004000000', '1008000000', '1040000000', '1043000000','1041000000','1042000000')
- AND A.TIMHDER_ASSIGN_DT IS NOT NULL
+ AND (A.SCCHF_ASSIGN IS NULL
+ OR A.TIMHDER_ASSIGN IN ('1004000000', '1008000000', '1040000000', '1043000000','1041000000','1042000000'))
AND A.EXAMINER_ASSIGN IS NULL
@@ -145,19 +142,7 @@
AND A.PRESIDENT_ASSIGN_DT IS NOT NULL
AND A.SCCHF_ASSIGN IS NOT NULL
AND A.SCCHF_ASSIGN_DT IS NOT NULL
- AND (A.TIMHDER_ASSIGN = #{memberDept}
-
-
- OR A.TIMHDER_ASSIGN = '1004000000'
-
-
- OR A.TIMHDER_ASSIGN = '1008000000'
-
-
- OR A.TIMHDER_ASSIGN = '1040000000'
-
-
- )
+ AND A.TIMHDER_ASSIGN = #{memberDept}
AND A.EXAMINER_ASSIGN IS NULL
@@ -287,11 +272,8 @@
AND STATE = '0302000000'
AND PRESIDENT_ASSIGN IS NOT NULL
AND PRESIDENT_ASSIGN_DT IS NOT NULL
- AND A.SCCHF_ASSIGN IS NOT NULL
- AND SCCHF_ASSIGN_DT IS NOT NULL
-
- AND TIMHDER_ASSIGN IN ('1004000000', '1008000000', '1040000000', '1043000000','1041000000','1042000000')
- AND TIMHDER_ASSIGN_DT IS NOT NULL
+ AND (A.SCCHF_ASSIGN IS NULL
+ OR A.TIMHDER_ASSIGN IN ('1004000000', '1008000000', '1040000000', '1043000000','1041000000','1042000000'))
AND EXAMINER_ASSIGN IS NULL
@@ -300,19 +282,7 @@
AND PRESIDENT_ASSIGN_DT IS NOT NULL
AND SCCHF_ASSIGN IS NOT NULL
AND SCCHF_ASSIGN_DT IS NOT NULL
- AND (TIMHDER_ASSIGN = #{memberDept}
-
-
- OR A.TIMHDER_ASSIGN = '1004000000'
-
-
- OR A.TIMHDER_ASSIGN = '1008000000'
-
-
- OR A.TIMHDER_ASSIGN = '1040000000'
-
-
- )
+ AND TIMHDER_ASSIGN = #{memberDept}
AND EXAMINER_ASSIGN IS NULL
diff --git a/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04_3.jsp b/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04_3.jsp
index 86d4fe49..b1fa2b3d 100644
--- a/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04_3.jsp
+++ b/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04_3.jsp
@@ -1165,9 +1165,10 @@
$("#applyForm").attr("action", frmAction);
}
+ /* 250313 - 공정, 약관은 실장 배정을 위하여 등록 시 부서배정 제외 */
var caseGubunVal = $("#caseGubun option:selected").val();
if(caseGubunVal == "${SeedConstants.GONGJEONGGEORAE}"){//공정거래
- $("#presidentAssign").val("${SeedConstants.GONGJEONG1}");
+ //$("#presidentAssign").val("${SeedConstants.GONGJEONG1}");
}else if(caseGubunVal == "${SeedConstants.GAMAENGGEORAE}"){//가맹사업거래
$("#presidentAssign").val("${SeedConstants.GAMAENG}");
}else if(caseGubunVal == "${SeedConstants.HADOGEUPGEORAE}"){//하도급거래
@@ -1180,7 +1181,7 @@
}else if(caseGubunVal == "${SeedConstants.DAEGYUMOGEORAE}"){//대규모유통거래
$("#presidentAssign").val("${SeedConstants.YUTONG}");
}else if(caseGubunVal == "${SeedConstants.YAKGWANGEORAE}"){//약관거래
- $("#presidentAssign").val("${SeedConstants.YAKGWAN1}");
+ //$("#presidentAssign").val("${SeedConstants.YAKGWAN1}");
}else if(caseGubunVal == "${SeedConstants.DAERIJEOMGEORAE}"){//대리점거래
$("#presidentAssign").val("${SeedConstants.DAERIJEOM}");
}
diff --git a/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04_4.jsp b/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04_4.jsp
index 8ea6e07f..dd6ae09b 100644
--- a/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04_4.jsp
+++ b/src/main/webapp/WEB-INF/jsp/_extra/web/user/mediation/mediationStep04_4.jsp
@@ -762,8 +762,9 @@ document.addEventListener('DOMContentLoaded', function() {
/* 공정/약관/플랫폼 팀의 경우 1팀 2팀 존재함으로 사건 조회 시 따로 or로 조건문 처리 */
+ /* 250313 - 공정, 약관은 실장 배정을 위하여 등록 시 부서배정 제외 */
if(caseGubunVal == "${SeedConstants.GONGJEONGGEORAE}"){//공정거래
- $("#presidentAssign").val("${SeedConstants.GONGJEONG1}"); //공정약관1팀
+ //$("#presidentAssign").val("${SeedConstants.GONGJEONG1}"); //공정약관1팀
}
else if(caseGubunVal == "${SeedConstants.GAMAENGGEORAE}"){//가맹사업거래
$("#presidentAssign").val("${SeedConstants.GAMAENG}"); //가맹대리점유통팀
@@ -780,7 +781,7 @@ document.addEventListener('DOMContentLoaded', function() {
$("#presidentAssign").val("${SeedConstants.YUTONG}"); //유통팀
}
else if(caseGubunVal == "${SeedConstants.YAKGWANGEORAE}"){//약관거래
- $("#presidentAssign").val("${SeedConstants.YAKGWAN1}"); //약관1팀
+ //$("#presidentAssign").val("${SeedConstants.YAKGWAN1}"); //약관1팀
}
else if(caseGubunVal == "${SeedConstants.DAERIJEOMGEORAE}"){//대리점거래
$("#presidentAssign").val("${SeedConstants.DAERIJEOM}"); //대리점팀
diff --git a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administWrite.jsp b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administWrite.jsp
index a764349e..eeccafdb 100644
--- a/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administWrite.jsp
+++ b/src/main/webapp/WEB-INF/jsp/seed/_extra/gtm/trublreqstmng/administWrite.jsp
@@ -311,8 +311,9 @@ $(document).ready(function(){
$("#presidentAssign").val("1009000000");
} */
/* 공정/약관/플랫폼 팀의 경우 1팀 2팀 존재함으로 사건 조회 시 따로 or로 조건문 처리 */
+ /* 250313 - 공정, 약관은 실장 배정을 위하여 등록 시 부서배정 제외 */
if(caseGubunVal == "${SeedConstants.GONGJEONGGEORAE}"){//공정거래
- $("#presidentAssign").val("${SeedConstants.GONGJEONG1}"); //공정약관1팀
+ //$("#presidentAssign").val("${SeedConstants.GONGJEONG1}"); //공정약관1팀
}
else if(caseGubunVal == "${SeedConstants.GAMAENGGEORAE}"){//가맹사업거래
$("#presidentAssign").val("${SeedConstants.GAMAENG}"); //가맹대리점유통팀
@@ -329,7 +330,7 @@ $(document).ready(function(){
$("#presidentAssign").val("${SeedConstants.YUTONG}"); //유통팀
}
else if(caseGubunVal == "${SeedConstants.YAKGWANGEORAE}"){//약관거래
- $("#presidentAssign").val("${SeedConstants.YAKGWAN1}"); //약관1팀
+ //$("#presidentAssign").val("${SeedConstants.YAKGWAN1}"); //약관1팀
}
else if(caseGubunVal == "${SeedConstants.DAERIJEOMGEORAE}"){//대리점거래
$("#presidentAssign").val("${SeedConstants.DAERIJEOM}"); //대리점팀