From 2fcc444b354447a731d210ed32be7b25437126fc 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: Tue, 31 Jan 2023 10:03:06 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A7=81=EC=B1=85=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95.=20=EC=A3=BC=EA=B0=84?=
 =?UTF-8?q?=EC=82=AC=EA=B1=B4=EC=B2=98=EB=A6=AC=ED=98=84=ED=99=A9=20?=
 =?UTF-8?q?=EB=B6=84=EB=A5=98=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

---
 .../com/dbnt/faisp/main/userInfo/service/UserInfoService.java | 3 +++
 .../templates/ivsgt/majorStatus/majorStatusEditModal.html     | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/service/UserInfoService.java b/src/main/java/com/dbnt/faisp/main/userInfo/service/UserInfoService.java
index c2b2871f..95301ded 100644
--- a/src/main/java/com/dbnt/faisp/main/userInfo/service/UserInfoService.java
+++ b/src/main/java/com/dbnt/faisp/main/userInfo/service/UserInfoService.java
@@ -111,6 +111,9 @@ public class UserInfoService implements UserDetailsService {
       if(!ObjectUtils.isEmpty(userInfo.getUserStatus())){
         savedInfo.setUserStatus(userInfo.getUserStatus());
       }
+      if(!ObjectUtils.isEmpty(userInfo.getDutyCd())){
+        savedInfo.setDutyCd(userInfo.getDutyCd());
+      }
       userInfoRepository.save(savedInfo);
       saveUserInfoHistory(savedInfo, loginUser);
     }
diff --git a/src/main/resources/templates/ivsgt/majorStatus/majorStatusEditModal.html b/src/main/resources/templates/ivsgt/majorStatus/majorStatusEditModal.html
index ebaebffb..07aae112 100644
--- a/src/main/resources/templates/ivsgt/majorStatus/majorStatusEditModal.html
+++ b/src/main/resources/templates/ivsgt/majorStatus/majorStatusEditModal.html
@@ -31,8 +31,8 @@
             <div class="col-sm-2">
                 <select class="form-select form-select-sm" id="majorType" name="majorType">
                     <option value="">선택해주세요.</option>
-                    <th:block th:each="commonCode:${session.commonCode.get('MST')}">
-                        <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq majorStatus.majorType}"></option>
+                    <th:block th:each="code:${session.commonCode.get('MST')}">
+                        <option th:if="${code.useChk eq 'T'}" th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq majorStatus.majorType}"></option>
                     </th:block>
                 </select>
             </div>