From bdd75315c4524501ceac7190e1f576ee41109755 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: Wed, 3 May 2023 11:57:03 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EB=AC=B8=20=EC=9D=B8=EC=87=84=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95.=20=EC=9D=B8=EC=82=AC?=
 =?UTF-8?q?=EC=8B=9C=EC=8A=A4=ED=85=9C=20=EC=97=B0=EB=8F=99=20=EC=98=A4?=
 =?UTF-8?q?=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

---
 .../java/com/dbnt/faisp/kwms/service/KwmsService.java  |  2 ++
 .../faisp/main/codeMgt/service/CodeMgtService.java     | 10 ++++++++++
 .../igActivities/fpiMgt/affair/affairViewModal.html    |  2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/dbnt/faisp/kwms/service/KwmsService.java b/src/main/java/com/dbnt/faisp/kwms/service/KwmsService.java
index 225d6689..b9b628b9 100644
--- a/src/main/java/com/dbnt/faisp/kwms/service/KwmsService.java
+++ b/src/main/java/com/dbnt/faisp/kwms/service/KwmsService.java
@@ -8,6 +8,7 @@ import com.dbnt.faisp.main.userInfo.model.UserInfo;
 import com.dbnt.faisp.main.userInfo.repository.UserCareerRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
@@ -22,6 +23,7 @@ public class KwmsService {
   private final CodeMgtService codeMgtService;
   private final UserCareerRepository careerRepository;
 
+  @Transactional
   public UserInfo selectEmpInfo(String dicCode){
     VEmployee empInfo = vEmployeeRepository.findByDic(dicCode).orElse(null);
     if(empInfo==null){
diff --git a/src/main/java/com/dbnt/faisp/main/codeMgt/service/CodeMgtService.java b/src/main/java/com/dbnt/faisp/main/codeMgt/service/CodeMgtService.java
index c775d9ef..797c9617 100644
--- a/src/main/java/com/dbnt/faisp/main/codeMgt/service/CodeMgtService.java
+++ b/src/main/java/com/dbnt/faisp/main/codeMgt/service/CodeMgtService.java
@@ -118,6 +118,16 @@ public class CodeMgtService{
       newCode.setItemValue(value);
       newCode.setUseChk("T");
       codeMgtRepository.save(newCode);
+
+      // 새 관서 등록시 부서 추가될 수 있도록 공통코드 카테고리 추가.
+      if(categoryCd.equals("OG")){
+        CodeCatg newCategory = new CodeCatg();
+        newCategory.setCategoryCd(newCode.getItemCd());
+        newCategory.setCategoryValue(newCode.getItemValue());
+        newCategory.setDescription(newCode.getItemValue()+" 부서");
+        codeCatgRepository.save(newCategory);
+      }
+
       return newCode.getItemCd();
     }
     return code.getItemCd();
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html
index b59b5056..7023c747 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html
@@ -338,7 +338,7 @@
 </div>
 <th:block th:if="${modalType ne 'viewOnly'}">
   <div class="modal-footer bg-light">
-    <th:block th:if="${affair.affairStatus eq 'DST006'}">
+    <th:block th:if="${affair.affairStatus eq 'DST006' or #lists.size(affair.rateList)>1}">
       <button type="button" class="btn btn-secondary" id="affairPrintBtn" th:data-affairkey="${affair.affairKey}">인쇄</button>
     </th:block>
     <th:block th:if="${userOrgan eq 'OG001' and accessAuth eq 'ACC003'}">