From c4ea7e3640ca06c3a50bd15879aa86f21e5cac74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Fri, 19 May 2023 11:14:46 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B5=AD=EC=A0=9C=EB=B2=94=EC=A3=84=20?=
 =?UTF-8?q?=EA=B2=80=EA=B1=B0=ED=98=84=ED=99=A9=20=EC=97=B4=EB=9E=8C?=
 =?UTF-8?q?=EB=AA=A8=EB=8B=AC=20=EC=96=91=EC=8B=9D=20=EC=88=98=EC=A0=95.?=
 =?UTF-8?q?=20=EA=B3=B5=EC=A7=80=EC=82=AC=ED=95=AD=20=EC=88=98=EC=A0=95?=
 =?UTF-8?q?=EC=8B=9C=20=ED=95=98=EC=9C=84=EA=B4=80=EC=84=9C=20=EB=85=B8?=
 =?UTF-8?q?=EC=B6=9C=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/publicBoard/service/PublicBoardService.java   |  4 ++++
 .../internationalCrimeArrestViewModal.html             | 10 ++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/main/publicBoard/service/PublicBoardService.java b/src/main/java/com/dbnt/faisp/main/publicBoard/service/PublicBoardService.java
index 19753f97..2c6270e9 100644
--- a/src/main/java/com/dbnt/faisp/main/publicBoard/service/PublicBoardService.java
+++ b/src/main/java/com/dbnt/faisp/main/publicBoard/service/PublicBoardService.java
@@ -9,6 +9,7 @@ import com.dbnt.faisp.main.publicBoard.model.PublicFile;
 import com.dbnt.faisp.main.publicBoard.repository.PublicBoardRepository;
 import com.dbnt.faisp.main.publicBoard.repository.PublicCommentRepository;
 import com.dbnt.faisp.main.publicBoard.repository.PublicFileRepository;
+import com.dbnt.faisp.util.Utils;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -48,6 +49,9 @@ public class PublicBoardService extends BaseService {
 
   @Transactional
   public Integer saveContent(PublicBoard publicBoard, List<Integer> deleteFileSeq) {
+    if(Utils.isEmpty(publicBoard.getOrganChk())){
+      publicBoard.setOrganChk("F");
+    }
     Integer publicKey = publicBoardRepository.save(publicBoard).getPublicKey();
     if(deleteFileSeq!=null && deleteFileSeq.size()>0){
       deletePublicFile(publicKey, deleteFileSeq);
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html
index 0fe41015..40072fc5 100644
--- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html
+++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html
@@ -7,12 +7,6 @@
 <div class="modal-body">
   <input type="hidden" name="icaKey" id="viewModalKey" th:value="${ica.icaKey}">
   <input type="hidden" name="icaKey" id="viewModalViolationType" th:value="${ica.violationType}">
-  <div class="row mb-1 justify-content-end">
-    <label class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
-    <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${ica.caseOfficer}"></label>
-    <label class="col-sm-1 col-form-label col-form-label-sm text-center">작성일시</label>
-    <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(ica.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
-  </div>
   <div class="row mb-1">
     <label class="col-sm-1 col-form-label col-form-label-sm text-center">지방청</label>
     <label class="col-sm-2 col-form-label col-form-label-sm text-start">
@@ -28,6 +22,8 @@
     </label>
     <label class="col-sm-1 col-form-label col-form-label-sm text-center">담당경찰관</label>
     <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${ica.caseOfficer}"></label>
+    <label class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
+    <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${ica.caseOfficer}"></label>
   </div>
   <div class="row mb-1">
     <label class="col-sm-1 col-form-label col-form-label-sm text-center">범죄테마</label>
@@ -44,6 +40,8 @@
     </label>
     <label class="col-sm-1 col-form-label col-form-label-sm text-center">죄명</label>
     <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${ica.crimeName}"></label>
+    <label class="col-sm-1 col-form-label col-form-label-sm text-center">작성일시</label>
+    <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(ica.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
   </div>
   <!--위반유형별 양식 시작-->
   <!--직접밀입국, 제주무사증 도외이탈, 밀출국 공통양식 시작-->