diff --git a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml
index e5eb7437..cbebb0af 100644
--- a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml
+++ b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml
@@ -91,7 +91,7 @@
a.wrt_dt
FROM international_crime_arrest a
- ORDER BY a.crime_awareness_dt DESC nulls last, wrt_dt desc
+ ORDER BY a.case_sent_dt DESC nulls last, wrt_dt desc
LIMIT #{rowCnt} OFFSET #{firstIndex}
diff --git a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js
index 92199835..a4d5b28a 100644
--- a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js
+++ b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js
@@ -240,43 +240,42 @@ function saveInternationalCrimeArrest(status){
}
function contentCheck(status){
- let flag = true;
if(status !== "DST001"){
if(!$("#organSelector").val()){
alert("지방청을 선택해주세요.")
- flag = false;
+ return false;
}
if(!$("#departmentSelector").val()){
alert("관할서를 선택해주세요.")
- flag = false;
+ return false;
}
if(!$("#caseOfficer").val()){
alert("담당경찰관을 입력해주세요.")
- flag = false;
+ return false;
}
if(!$("#crimeType").val()){
alert("범죄테마를 선택해주세요.")
- flag = false;
+ return false;
}
if(!$("#violationType").val()){
alert("위반유형을 선택해주세요.")
- flag = false;
+ return false;
}
if(!$("#crimeName").val()){
alert("죄명을 입력해주세요.")
- flag = false;
+ return false;
}
if(!$("#occurTable").val()){
alert("발생원표를 입력해주세요.")
- flag = false;
+ return false;
}
if(!$("#arrestTable").val()){
alert("검거원표를 입력해주세요.")
- flag = false;
+ return false;
}
if(!$("#suspectTable").val()){
alert("피의자원표를 입력해주세요.")
- flag = false;
+ return false;
}
const suspectNames = $("#spiDiv").find(".suspectName");
let suspectFlag = false;
@@ -287,28 +286,28 @@ function contentCheck(status){
})
if(suspectFlag){
alert("피의자 이름을 입력해주세요")
- flag = false;
+ return false;
}
if(!$("#caseSentDt").val()){
alert("사건송치를 입력해주세요.")
- flag = false;
+ return false;
}
if(!CrossEditor.IsDirty()){
alert("범죄사실을 입력해주세요.")
- flag = false;
+ return false;
}
}
if($("#crimeAwarenessDt").val()){
if(!$("#crimeAwarenessDate").val()){
alert("검거일자를 입력해주세요.")
- flag = false;
+ return false;
}
if(!$("#crimeAwarenessTime").val()){
alert("검거시간을 입력해주세요.")
- flag = false;
+ return false;
}
}
- return flag;
+ return true;
}
$(document).on('click', '#icaExcelDownBtn', function (){
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaList.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaList.html
index f57a25e7..0152bc3c 100644
--- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaList.html
+++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaList.html
@@ -103,8 +103,8 @@