From c9b7f6131dc9a23c682bce70d9fc9547575c42bf 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, 22 Feb 2023 18:00:32 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EC=84=9C=EB=B3=84=20=EB=B6=80?=
 =?UTF-8?q?=EC=84=9C=20=EC=84=A4=EC=A0=95=20=EC=9E=91=EC=97=85=EC=A4=91.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dbnt/faisp/config/BaseController.java |  2 +-
 .../com/dbnt/faisp/kwms/KwmsController.java   |  8 +-
 .../dbnt/faisp/kwms/service/KwmsService.java  |  2 +-
 .../faisp/main/userInfo/PoliceController.java |  8 --
 .../mybatisMapper/UserInfoMapper.xml          |  3 +-
 .../templates/adminPage/authMgt/authMgt.html  | 12 ++-
 .../adminPage/userMgt/accessChange.html       |  8 +-
 .../adminPage/userMgt/userEditModal.html      |  4 +-
 .../templates/adminPage/userMgt/userMgt.html  | 51 +++++-----
 .../templates/common/modal/userModal.html     | 16 ++--
 .../activityCase/officerDiv.html              |  2 +-
 .../resources/templates/faRpt/faRptBoard.html | 20 ++--
 .../templates/faRpt/faRptEditModal.html       |  2 +-
 .../templates/faRpt/faRptViewModal.html       |  2 +-
 .../templates/faRpt/readUserRow.html          |  2 +-
 .../faStatistics/asfCov/asfCovViewModal.html  |  2 +-
 .../igActivities/fpiMgt/affair/affairMgt.html |  2 +-
 .../fpiMgt/affairPlan/planMgt.html            | 24 +++--
 .../fpiMgt/affairResult/resultMgt.html        | 24 +++--
 .../templates/police/career/careerModal.html  |  6 +-
 .../police/education/eduEditModal.html        |  2 +-
 .../police/education/educationMgt.html        | 92 ++++++++++++++-----
 .../police/police/historyValueDiv.html        |  4 +-
 .../police/police/policeEditModal.html        |  2 +-
 .../publicBoard/board/boardPage.html          |  2 +-
 .../publicBoard/board/boardViewModal.html     |  4 +-
 .../templates/publicBoard/commentDiv.html     |  4 +-
 .../publicBoard/notice/noticePage.html        |  2 +-
 .../publicBoard/notice/noticeViewModal.html   |  4 +-
 .../templates/publicBoard/qna/qnaPage.html    |  2 +-
 .../publicBoard/qna/qnaViewModal.html         | 12 +--
 .../publicBoard/reference/referencePage.html  | 24 +++--
 .../reference/referenceViewModal.html         |  4 +-
 .../resources/templates/sri/readUserRow.html  |  2 +-
 .../resources/templates/sri/sriBoard.html     | 16 ++--
 .../resources/templates/sri/sriEditModal.html |  2 +-
 .../resources/templates/sri/sriViewModal.html |  2 +-
 src/main/resources/templates/user/myInfo.html |  2 +-
 38 files changed, 224 insertions(+), 158 deletions(-)

diff --git a/src/main/java/com/dbnt/faisp/config/BaseController.java b/src/main/java/com/dbnt/faisp/config/BaseController.java
index f39b183b..28aa42e3 100644
--- a/src/main/java/com/dbnt/faisp/config/BaseController.java
+++ b/src/main/java/com/dbnt/faisp/config/BaseController.java
@@ -123,7 +123,7 @@ public class BaseController {
     session.setAttribute("userOrgan", loginUser.getOgCd());
     String belongValue = "";
     belongValue += searchCodeValue(loginUser.getOgCd(), codeMap.get("OG"));
-    belongValue += searchCodeValue(loginUser.getOfcCd(), codeMap.get("OFC"));
+    belongValue += searchCodeValue(loginUser.getOfcCd(), codeMap.get(loginUser.getOgCd()));
     belongValue += searchCodeValue(loginUser.getTitleCd(), codeMap.get("JT"));
     belongValue += loginUser.getUserNm()+"("+loginUser.getUserId()+")";
     session.setAttribute("belongValue", belongValue);
diff --git a/src/main/java/com/dbnt/faisp/kwms/KwmsController.java b/src/main/java/com/dbnt/faisp/kwms/KwmsController.java
index 3650a82a..a2e07cde 100644
--- a/src/main/java/com/dbnt/faisp/kwms/KwmsController.java
+++ b/src/main/java/com/dbnt/faisp/kwms/KwmsController.java
@@ -40,13 +40,13 @@ public class KwmsController {
           mav.addObject("joinFlag", "T");
           mav.addObject("userInfo", userInfo);
           mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG"));
-          mav.addObject("ofcList", codeMgtService.selectCodeMgtList("OFC"));
+          mav.addObject("ofcList", codeMgtService.selectCodeMgtList(userInfo.getOgCd()));
           mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT"));
           mav.addObject("dutyList", codeMgtService.selectCodeMgtList("DT"));
           mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC"));
           mav.addObject("seriesList", codeMgtService.selectCodeMgtList(userInfo.getOutturnCd()));
           mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG"));
-          mav.addObject("eduGrdList", codeMgtService.selectCodeMgtList("EDU"));
+          mav.addObject("eduGrdList", codeMgtService.selectCodeMgtList("UED"));
         }
       }else{
         if(savedUser.getUserStatus().equals("USC004")){
@@ -55,7 +55,7 @@ public class KwmsController {
           mav.addObject("joinFlag", "T");
           mav.addObject("userInfo", userInfo);
           mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG"));
-          mav.addObject("ofcList", codeMgtService.selectCodeMgtList("OFC"));
+          mav.addObject("ofcList", codeMgtService.selectCodeMgtList(userInfo.getOgCd()));
           mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT"));
           mav.addObject("dutyList", codeMgtService.selectCodeMgtList("DT"));
           mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC"));
@@ -85,7 +85,7 @@ public class KwmsController {
         mav.addObject("joinFlag", "T");
         mav.addObject("userInfo", userInfo);
         mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG"));
-        mav.addObject("ofcList", codeMgtService.selectCodeMgtList("OFC"));
+        mav.addObject("ofcList", codeMgtService.selectCodeMgtList(userInfo.getOgCd()));
         mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT"));
         mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC"));
         mav.addObject("seriesList", codeMgtService.selectCodeMgtList("SRC"));
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 28375fc9..225d6689 100644
--- a/src/main/java/com/dbnt/faisp/kwms/service/KwmsService.java
+++ b/src/main/java/com/dbnt/faisp/kwms/service/KwmsService.java
@@ -41,7 +41,7 @@ public class KwmsService {
       String[] positionAry = empInfo.getLdeptnm().split(" ");
       userInfo.setOgCd(codeMgtService.searchCodeToCategoryAndValue("OG", positionAry[0]));
       if (positionAry.length>1){
-        userInfo.setOfcCd(codeMgtService.searchCodeToCategoryAndValue("OFC", positionAry[1]));
+        userInfo.setOfcCd(codeMgtService.searchCodeToCategoryAndValue(userInfo.getOgCd(), positionAry[1]));
       }
     }
     userInfo.setTitleCd(codeMgtService.searchCodeToCategoryAndValue("JT", empInfo.getJikgubnm()));
diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/PoliceController.java b/src/main/java/com/dbnt/faisp/main/userInfo/PoliceController.java
index 25303a8d..e7bd9f44 100644
--- a/src/main/java/com/dbnt/faisp/main/userInfo/PoliceController.java
+++ b/src/main/java/com/dbnt/faisp/main/userInfo/PoliceController.java
@@ -88,14 +88,6 @@ public class PoliceController {
   @GetMapping("/policeEditModal")
   public ModelAndView policeEditModal(@AuthenticationPrincipal UserInfo loginUser,UserInfo userInfo){
     ModelAndView mav = new ModelAndView("police/police/policeEditModal");
-    mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG"));
-    mav.addObject("ofcList", codeMgtService.selectCodeMgtList("OFC"));
-    mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT"));
-    mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC"));
-    mav.addObject("seriesList", codeMgtService.selectCodeMgtList("SRC"));
-    mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG"));
-    mav.addObject("statusList", codeMgtService.selectCodeMgtList("USC"));
-
     //메뉴권한 확인
     String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/police/policeList").get(0).getAccessAuth();
     mav.addObject("accessAuth", accessAuth);
diff --git a/src/main/resources/mybatisMapper/UserInfoMapper.xml b/src/main/resources/mybatisMapper/UserInfoMapper.xml
index 4e593b9d..7a699686 100644
--- a/src/main/resources/mybatisMapper/UserInfoMapper.xml
+++ b/src/main/resources/mybatisMapper/UserInfoMapper.xml
@@ -53,10 +53,11 @@
            og_cd,
            ofc_cd,
            title_cd,
+           duty_cd,
            wrt_dt
     from user_info
     <include refid="selectUserInfoWhere"></include>
-    order by og_cd, ofc_cd, title_cd desc
+    order by og_cd, title_cd desc
     limit #{rowCnt} offset #{firstIndex}
   </select>
 
diff --git a/src/main/resources/templates/adminPage/authMgt/authMgt.html b/src/main/resources/templates/adminPage/authMgt/authMgt.html
index 803bbd64..4fbe27ab 100644
--- a/src/main/resources/templates/adminPage/authMgt/authMgt.html
+++ b/src/main/resources/templates/adminPage/authMgt/authMgt.html
@@ -41,8 +41,10 @@
                   <div class="col-auto">
                     <select class="form-select form-select-sm" name="ofcCd">
                       <option value="">부서 선택</option>
-                      <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
-                        <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${searchParams.ofcCd==commonCode.itemCd}"></option>
+                      <th:block th:each="parentCode:${session.commonCode.get('OG')}">
+                        <th:block th:each="code:${session.commonCode.get(parentCode.itemCd)}">
+                          <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${searchParams.ofcCd eq code.itemCd}"></option>
+                        </th:block>
                       </th:block>
                     </select>
                   </div>
@@ -81,12 +83,12 @@
                         <input type="hidden" class="userNm" th:value="${userInfo.userNm}">
                         <td>
                           <th:block th:each="commonCode:${session.commonCode.get('OG')}">
-                            <th:block th:if="${commonCode.itemCd == userInfo.ogCd}" th:text="${commonCode.itemValue}"></th:block>
+                            <th:block th:if="${commonCode.itemCd eq userInfo.ogCd}" th:text="${commonCode.itemValue}"></th:block>
                           </th:block>
                         </td>
                         <td>
-                          <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
-                            <th:block th:if="${commonCode.itemCd == userInfo.ofcCd}" th:text="${commonCode.itemValue}"></th:block>
+                          <th:block th:each="commonCode:${session.commonCode.get(userInfo.ogCd)}">
+                            <th:block th:if="${commonCode.itemCd eq userInfo.ofcCd}" th:text="${commonCode.itemValue}"></th:block>
                           </th:block>
                         </td>
                         <td></td>
diff --git a/src/main/resources/templates/adminPage/userMgt/accessChange.html b/src/main/resources/templates/adminPage/userMgt/accessChange.html
index 21a2e5f5..997a06b4 100644
--- a/src/main/resources/templates/adminPage/userMgt/accessChange.html
+++ b/src/main/resources/templates/adminPage/userMgt/accessChange.html
@@ -39,8 +39,10 @@
                 <div class="col-auto">
                   <select class="form-select form-select-sm" name="ofcCd">
                     <option value="">부서 선택</option>
-                    <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
-                      <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${searchParams.ofcCd==commonCode.itemCd}"></option>
+                    <th:block th:each="parentCode:${session.commonCode.get('OG')}">
+                      <th:block th:each="code:${session.commonCode.get(parentCode.itemCd)}">
+                        <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${searchParams.ofcCd eq code.itemCd}"></option>
+                      </th:block>
                     </th:block>
                   </select>
                 </div>
@@ -92,7 +94,7 @@
                       </th:block>
                     </td>
                     <td>
-                      <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
+                      <th:block th:each="commonCode:${session.commonCode.get(userInfo.ogCd)}">
                         <th:block th:if="${commonCode.itemCd == userInfo.ofcCd}" th:text="${commonCode.itemValue}"></th:block>
                       </th:block>
                     </td>
diff --git a/src/main/resources/templates/adminPage/userMgt/userEditModal.html b/src/main/resources/templates/adminPage/userMgt/userEditModal.html
index aa9d26c4..35c1f3fb 100644
--- a/src/main/resources/templates/adminPage/userMgt/userEditModal.html
+++ b/src/main/resources/templates/adminPage/userMgt/userEditModal.html
@@ -104,8 +104,8 @@
       <div class="col-sm-2">
         <select class="form-select form-select-sm" id="ofcCd" name="ofcCd" th:disabled="${!#strings.isEmpty(userInfo.dicCode)}">
           <option value="">--선택--</option>
-          <th:block th:each="code:${session.commonCode.get('OFC')}">
-            <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.ofcCd}"></option>
+          <th:block th:each="code:${session.commonCode.get(userInfo.ogCd)}">
+            <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${userInfo.ofcCd eq code.itemCd}"></option>
           </th:block>
         </select>
       </div>
diff --git a/src/main/resources/templates/adminPage/userMgt/userMgt.html b/src/main/resources/templates/adminPage/userMgt/userMgt.html
index f2608395..be54f12d 100644
--- a/src/main/resources/templates/adminPage/userMgt/userMgt.html
+++ b/src/main/resources/templates/adminPage/userMgt/userMgt.html
@@ -49,8 +49,10 @@
                     <div class="col-auto">
                       <select class="form-select form-select-sm" name="ofcCd">
                         <option value="">부서 선택</option>
-                        <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
-                          <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${searchParams.ofcCd==commonCode.itemCd}"></option>
+                        <th:block th:each="parentCode:${session.commonCode.get('OG')}">
+                          <th:block th:each="code:${session.commonCode.get(parentCode.itemCd)}">
+                            <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${searchParams.ofcCd eq code.itemCd}"></option>
+                          </th:block>
                         </th:block>
                       </select>
                     </div>
@@ -84,6 +86,7 @@
                     <th>소속</th>
                     <th>부서</th>
                     <th>계급</th>
+                    <th>직책</th>
                     <th>성명</th>
                     <th>아이디</th>
                     <th>식별번호</th>
@@ -97,36 +100,26 @@
                     <td class="checkBoxTd">
                       <input type="checkbox" id="userChk" name="userChk" class="userInfoCheckBox" th:value="${userInfo.userSeq}">
                     </td>
-                    <th:block th:if="${userInfo.ogCd eq null or userInfo.ogCd eq ''}">
-                      <td></td>
-                    </th:block>
-                    <th:block th:unless="${userInfo.ogCd eq null or userInfo.ogCd eq ''}">
-                      <th:block th:each="commonCode:${session.commonCode.get('OG')}">
-                        <th:block th:if="${commonCode.itemCd == userInfo.ogCd}">
-                          <td th:text="${commonCode.itemValue}"></td>
-                        </th:block>
+                    <td>
+                      <th:block th:each="code:${session.commonCode.get('OG')}">
+                        <th:block th:if="${code.itemCd eq userInfo.ogCd}" th:text="${code.itemValue}"></th:block>
                       </th:block>
-                    </th:block>
-                    <th:block th:if="${userInfo.ofcCd eq null or userInfo.ofcCd eq ''}">
-                      <td></td>
-                    </th:block>
-                    <th:block th:unless="${userInfo.ofcCd eq null or userInfo.ofcCd eq ''}">
-                      <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
-                        <th:block th:if="${commonCode.itemCd == userInfo.ofcCd}">
-                          <td th:text="${commonCode.itemValue}"></td>
-                        </th:block>
+                    </td>
+                    <td>
+                      <th:block th:each="code:${session.commonCode.get(userInfo.ogCd)}">
+                        <th:block th:if="${code.itemCd eq userInfo.ofcCd}" th:text="${code.itemValue}"></th:block>
                       </th:block>
-                    </th:block>
-                    <th:block th:if="${userInfo.titleCd eq null or userInfo.titleCd eq ''}">
-                      <td></td>
-                    </th:block>
-                    <th:block th:unless="${userInfo.titleCd eq null or userInfo.titleCd eq ''}">
-                      <th:block th:each="commonCode:${session.commonCode.get('JT')}">
-                        <th:block th:if="${commonCode.itemCd == userInfo.titleCd}">
-                          <td th:text="${commonCode.itemValue}"></td>
-                        </th:block>
+                    </td>
+                    <td>
+                      <th:block th:each="code:${session.commonCode.get('JT')}">
+                        <th:block th:if="${code.itemCd eq userInfo.titleCd}" th:text="${code.itemValue}"></th:block>
                       </th:block>
-                    </th:block>
+                    </td>
+                    <td>
+                      <th:block th:each="code:${session.commonCode.get('DT')}">
+                        <th:block th:if="${code.itemCd eq userInfo.dutyCd}" th:text="${code.itemValue}"></th:block>
+                      </th:block>
+                    </td>
                     <td th:text="${userInfo.userNm}"></td>
                     <td th:text="${userInfo.userId}"></td>
                     <td th:text="${userInfo.dicCode}"></td>
diff --git a/src/main/resources/templates/common/modal/userModal.html b/src/main/resources/templates/common/modal/userModal.html
index 22c1bd51..a24f4c33 100644
--- a/src/main/resources/templates/common/modal/userModal.html
+++ b/src/main/resources/templates/common/modal/userModal.html
@@ -66,16 +66,16 @@
                   <td>
                     <input type="checkbox" name="userChk" class="userInfoCheckBox" th:value="${userInfo.userSeq}">
                   </td>
-                  <th:block th:each="commonCode:${session.commonCode.get('OG')}">
-                    <th:block th:if="${commonCode.itemCd == userInfo.ogCd}">
-                      <td th:text="${commonCode.itemValue}"></td>
+                  <td>
+                    <th:block th:each="commonCode:${session.commonCode.get('OG')}">
+                      <th:block th:if="${commonCode.itemCd eq userInfo.ogCd}" th:text="${commonCode.itemValue}"></th:block>
                     </th:block>
-                  </th:block>
-                  <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
-                    <th:block th:if="${commonCode.itemCd == userInfo.ofcCd}">
-                      <td th:text="${commonCode.itemValue}"></td>
+                  </td>
+                  <td>
+                    <th:block th:each="commonCode:${session.commonCode.get(userInfo.ogCd)}">
+                      <th:block th:if="${commonCode.itemCd eq userInfo.ofcCd}" th:text="${commonCode.itemValue}"></th:block>
                     </th:block>
-                  </th:block>
+                  </td>
                   <td></td>
                   <td th:text="${userInfo.userNm}"></td>
                   <td th:text="${userInfo.userId}"></td>
diff --git a/src/main/resources/templates/counterIntelligence/activityCase/officerDiv.html b/src/main/resources/templates/counterIntelligence/activityCase/officerDiv.html
index 1aba6b7b..a3a6794e 100644
--- a/src/main/resources/templates/counterIntelligence/activityCase/officerDiv.html
+++ b/src/main/resources/templates/counterIntelligence/activityCase/officerDiv.html
@@ -18,7 +18,7 @@
     <th:block th:each="commonCode:${session.commonCode.get('OG')}">
       <th:block th:if="${commonCode.itemCd eq officer.ogCd}" th:text="${commonCode.itemValue}"></th:block>
     </th:block>
-    <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
+    <th:block th:each="commonCode:${session.commonCode.get(officer.ogCd)}">
       <th:block th:if="${commonCode.itemCd eq officer.ofcCd}" th:text="${commonCode.itemValue}"></th:block>
     </th:block>
     <th:block th:each="commonCode:${session.commonCode.get('JT')}">
diff --git a/src/main/resources/templates/faRpt/faRptBoard.html b/src/main/resources/templates/faRpt/faRptBoard.html
index a40fbb51..014ec450 100644
--- a/src/main/resources/templates/faRpt/faRptBoard.html
+++ b/src/main/resources/templates/faRpt/faRptBoard.html
@@ -106,20 +106,24 @@
                     <td><input type="checkbox" class="trChkBox"></td>
 -->
                     <td th:text="${cnt.count}"></td>
-                    <th:block th:each="commonCode:${session.commonCode.get('OG')}">
-                      <td th:if="${faRpt.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                    </th:block>
                     <td>
-                    <th:block th:each="commonCode:${session.commonCode.get('FRC')}">
-                    <th:text th:if="${commonCode.itemCd eq faRpt.faRptType}" th:text="${commonCode.itemValue}"></th:text>
+                    <th:block th:each="code:${session.commonCode.get('OG')}">
+                      <th:block th:if="${faRpt.wrtOrgan eq code.itemCd}" th:text="${code.itemValue}"></th:block>
                     </th:block>
                     </td>
+                    <td>
+                      <th:block th:each="code:${session.commonCode.get('FRC')}">
+                        <th:text th:if="${code.itemCd eq faRpt.faRptType}" th:text="${code.itemValue}"></th:text>
+                      </th:block>
+                    </td>
                     <td class="titleLeft" th:text="${faRpt.title}"></td>
                     <td th:text="${faRpt.fileCnt eq null?'파일 없음':#strings.concat(faRpt.fileCnt,' 건')}"></td>
                     <td th:text="|${faRpt.readCnt}/${faRpt.userCnt}|"></td>
-                    <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
-                      <td th:if="${faRpt.wrtPart eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                    </th:block>
+                    <td>
+                      <th:block th:each="code:${session.commonCode.get(faRpt.wrtOrgan)}">
+                        <th:block th:if="${faRpt.wrtPart eq code.itemCd}" th:text="${code.itemValue}"></th:block>
+                      </th:block>
+                    </td>
                     <td th:text="${faRpt.wrtUserNm}"></td>
                     <td th:text="${#temporals.format(faRpt.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
                     <td th:if="${faRpt.status ne 'receive'}">
diff --git a/src/main/resources/templates/faRpt/faRptEditModal.html b/src/main/resources/templates/faRpt/faRptEditModal.html
index e5b6172c..f106457d 100644
--- a/src/main/resources/templates/faRpt/faRptEditModal.html
+++ b/src/main/resources/templates/faRpt/faRptEditModal.html
@@ -103,7 +103,7 @@
                   <th:block th:each="commonCode:${session.commonCode.get('OG')}">
                     <th:block th:if="${commonCode.itemCd eq readUser.ogCd}" th:text="${commonCode.itemValue}"></th:block>
                   </th:block>
-                  <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
+                  <th:block th:each="commonCode:${session.commonCode.get(readUser.ogCd)}">
                     <th:block th:if="${commonCode.itemCd eq readUser.ofcCd}" th:text="${commonCode.itemValue}"></th:block>
                   </th:block>
                   <!--<th:block th:each="commonCode:${session.commonCode.get('JT')}">
diff --git a/src/main/resources/templates/faRpt/faRptViewModal.html b/src/main/resources/templates/faRpt/faRptViewModal.html
index 6c6bd4eb..47d586f7 100644
--- a/src/main/resources/templates/faRpt/faRptViewModal.html
+++ b/src/main/resources/templates/faRpt/faRptViewModal.html
@@ -61,7 +61,7 @@
                 <th:block th:each="commonCode:${session.commonCode.get('OG')}">
                   <th:block th:if="${commonCode.itemCd eq readUser.ogCd}" th:text="${commonCode.itemValue}"></th:block>
                 </th:block>
-                <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
+                <th:block th:each="commonCode:${session.commonCode.get(readUser.ogCd)}">
                   <th:block th:if="${commonCode.itemCd eq readUser.ofcCd}" th:text="${commonCode.itemValue}"></th:block>
                 </th:block>
                 <!--<th:block th:each="commonCode:${session.commonCode.get('JT')}">
diff --git a/src/main/resources/templates/faRpt/readUserRow.html b/src/main/resources/templates/faRpt/readUserRow.html
index bf76f099..f6120146 100644
--- a/src/main/resources/templates/faRpt/readUserRow.html
+++ b/src/main/resources/templates/faRpt/readUserRow.html
@@ -12,7 +12,7 @@
     <th:block th:each="commonCode:${session.commonCode.get('OG')}">
       <th:block th:if="${commonCode.itemCd eq readUser.ogCd}" th:text="${commonCode.itemValue}"></th:block>
     </th:block>
-    <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
+    <th:block th:each="commonCode:${session.commonCode.get(readUser.ogCd)}">
       <th:block th:if="${commonCode.itemCd eq readUser.ofcCd}" th:text="${commonCode.itemValue}"></th:block>
     </th:block>
     <!--<th:block th:each="commonCode:${session.commonCode.get('JT')}">
diff --git a/src/main/resources/templates/faStatistics/asfCov/asfCovViewModal.html b/src/main/resources/templates/faStatistics/asfCov/asfCovViewModal.html
index 755d58dd..a3cf7d0e 100644
--- a/src/main/resources/templates/faStatistics/asfCov/asfCovViewModal.html
+++ b/src/main/resources/templates/faStatistics/asfCov/asfCovViewModal.html
@@ -100,7 +100,7 @@
                                 <th:block th:each="commonCode:${session.commonCode.get('OG')}">
                                     <th:block th:if="${asfcov.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
                                 </th:block>
-                                <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
+                                <th:block th:each="commonCode:${session.commonCode.get(asfcov.wrtOrgan)}">
                                     <th:block th:if="${asfcov.wrtPart eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
                                 </th:block>
                                 <br>
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html
index 1ec1d014..9f42c55a 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html
@@ -188,7 +188,7 @@
                       </th:block>
                     </td>
                     <td>
-                      <th:block th:each="code:${session.commonCode.get('OFC')}">
+                      <th:block th:each="code:${session.commonCode.get(affair.wrtOrgan)}">
                         <th:block th:if="${affair.wrtPart eq code.itemCd}" th:text="${code.itemValue}"></th:block>
                       </th:block>
                     </td>
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html
index 3653dacd..eb7d4b5e 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html
@@ -120,18 +120,24 @@
                     <td th:text="${cnt.count}"></td>
                     <td class="titleLeft" th:text="${plan.contentTitle}"></td>
                     <td th:text="${#temporals.format(plan.planDt, 'yyyy-MM-dd')}"></td>
-                    <th:block th:each="commonCode:${session.commonCode.get('OG')}">
-                      <td th:if="${plan.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                    </th:block>
-                    <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
-                      <td th:if="${plan.wrtPart eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                    </th:block>
+                    <td>
+                      <th:block th:each="code:${session.commonCode.get('OG')}">
+                        <th:block th:if="${plan.wrtOrgan eq code.itemCd}" th:text="${code.itemValue}"></th:block>
+                      </th:block>
+                    </td>
+                    <td>
+                      <th:block th:each="code:${session.commonCode.get(plan.wrtOrgan)}">
+                        <th:block th:if="${plan.wrtPart eq code.itemCd}" th:text="${code.itemValue}"></th:block>
+                      </th:block>
+                    </td>
                     <td th:text="${plan.wrtUserNm}"></td>
                     <td th:text="${#temporals.format(plan.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
                     <td th:text="${plan.fileCnt eq null?'파일 없음':#strings.concat(plan.fileCnt,' 건')}"></td>
-                    <th:block th:each="commonCode:${session.commonCode.get('DST')}">
-                      <td th:if="${plan.planState eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                    </th:block>
+                    <td>
+                      <th:block th:each="code:${session.commonCode.get('DST')}">
+                        <th:block th:if="${plan.planState eq code.itemCd}" th:text="${code.itemValue}"></th:block>
+                      </th:block>
+                    </td>
                   </tr>
                   </tbody>
                 </table>
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html
index 70f490e2..9fd6abf6 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultMgt.html
@@ -116,19 +116,25 @@
                     <td th:text="${cnt.count}"></td>
                     <td class="titleLeft" th:text="${result.resultTitle}"></td>
                     <td th:text="${#strings.concat(#temporals.format(result.workStartDt, 'yyyy-MM-dd'), '~', #temporals.format(result.workEndDt, 'yyyy-MM-dd'))}"></td>
-                    <th:block th:each="commonCode:${session.commonCode.get('OG')}">
-                      <td th:if="${result.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                    </th:block>
-                    <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
-                      <td th:if="${result.wrtPart eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                    </th:block>
+                    <td>
+                      <th:block th:each="commonCode:${session.commonCode.get('OG')}">
+                        <th:block th:if="${result.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
+                      </th:block>
+                    </td>
+                    <td>
+                      <th:block th:each="commonCode:${session.commonCode.get(result.wrtOrgan)}">
+                        <th:block th:if="${result.wrtPart eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
+                      </th:block>
+                    </td>
                     <td th:text="${result.wrtUserNm}"></td>
                     <td th:text="${#temporals.format(result.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
                     <td th:text="${result.fileCnt eq null?'파일 없음':#strings.concat(result.fileCnt,' 건')}"></td>
                     <td th:text="${result.affairCnt eq null?'견문 없음':#strings.concat(result.affairCnt,' 건')}"></td>
-                    <th:block th:each="commonCode:${session.commonCode.get('DST')}">
-                      <td th:if="${result.resultState eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                    </th:block>
+                    <td>
+                      <th:block th:each="commonCode:${session.commonCode.get('DST')}">
+                        <th:block th:if="${result.resultState eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
+                      </th:block>
+                    </td>
                   </tr>
                   </tbody>
                 </table>
diff --git a/src/main/resources/templates/police/career/careerModal.html b/src/main/resources/templates/police/career/careerModal.html
index a2f0a577..3fd99065 100644
--- a/src/main/resources/templates/police/career/careerModal.html
+++ b/src/main/resources/templates/police/career/careerModal.html
@@ -5,7 +5,7 @@
     <th:block th:each="code:${session.commonCode.get('OG')}">
       <th:block th:if="${code.itemCd eq userInfo.ogCd}" th:text="${code.itemValue}"></th:block>
     </th:block>
-    <th:block th:each="code:${session.commonCode.get('OFC')}">
+    <th:block th:each="code:${session.commonCode.get(userInfo.ogCd)}">
       <th:block th:if="${code.itemCd eq userInfo.ofcCd}" th:text="${code.itemValue}"></th:block>
     </th:block>
     <th:block th:each="code:${session.commonCode.get('JT')}">
@@ -65,7 +65,7 @@
                         <td th:text="${code.itemValue}"></td>
                       </th:block>
                     </th:block>
-                    <th:block th:each="code:${session.commonCode.get('OFC')}">
+                    <th:block th:each="code:${session.commonCode.get(career.workOrgan)}">
                       <th:block th:if="${code.itemCd eq career.workPart}">
                         <td th:text="${code.itemValue}"></td>
                       </th:block>
@@ -89,7 +89,7 @@
                         <th:block th:text="${code.itemValue}"></th:block>
                       </th:block>
                     </th:block>
-                    <th:block th:each="code:${session.commonCode.get('OFC')}">
+                    <th:block th:each="code:${session.commonCode.get(career.workOrgan)}">
                       <th:block th:if="${code.itemCd eq career.workPart}">
                         <th:block th:text="${code.itemValue}"></th:block>
                       </th:block>
diff --git a/src/main/resources/templates/police/education/eduEditModal.html b/src/main/resources/templates/police/education/eduEditModal.html
index b8380aab..eaa9b489 100644
--- a/src/main/resources/templates/police/education/eduEditModal.html
+++ b/src/main/resources/templates/police/education/eduEditModal.html
@@ -14,7 +14,7 @@
     </label>
     <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">부서</label>
     <label class="col-sm-2 col-form-label col-form-label-sm text-start">
-      <th:block th:each="code:${session.commonCode.get('OFC')}">
+      <th:block th:each="code:${session.commonCode.get(userInfo.ogCd)}">
         <th:block th:if="${code.itemCd eq userInfo.ofcCd}" th:text="${code.itemValue}"></th:block>
       </th:block>
     </label>
diff --git a/src/main/resources/templates/police/education/educationMgt.html b/src/main/resources/templates/police/education/educationMgt.html
index f20b65fd..fcc85a10 100644
--- a/src/main/resources/templates/police/education/educationMgt.html
+++ b/src/main/resources/templates/police/education/educationMgt.html
@@ -48,28 +48,78 @@
                     </div>
                     <div class="col-8">
                       <div class="row justify-content-end">
-                        <div class="col-auto">
-                          <select class="form-select form-select-sm" name="ogCd">
-                            <option value="">관서 선택</option>
-                            <th:block th:each="commonCode:${session.commonCode.get('OG')}">
-                              <th:block th:if="${#lists.contains(mgtOrganList, commonCode.itemCd)}">
-                                <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${searchParams.ogCd eq commonCode.itemCd}"></option>
-                              </th:block>
-                            </th:block>
-                          </select>
+                        <div class="col-11">
+                          <div class="row">
+                            <div class="col-4"></div>
+                            <div class="col-2">
+                              <select class="form-select form-select-sm" name="ogCd">
+                                <option value="">관서 선택</option>
+                                <th:block th:each="code:${session.commonCode.get('OG')}">
+                                  <th:block th:if="${#lists.contains(mgtOrganList, code.itemCd)}">
+                                    <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${searchParams.ogCd eq code.itemCd}"></option>
+                                  </th:block>
+                                </th:block>
+                              </select>
+                            </div>
+                            <div class="col-2">
+                              <select class="form-select form-select-sm" name="ofcCd">
+                                <option value="">부서 선택</option>
+                                <th:block th:each="parentCode:${session.commonCode.get('OG')}">
+                                  <th:block th:each="code:${session.commonCode.get(parentCode.itemCd)}">
+                                    <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${searchParams.ofcCd eq code.itemCd}"></option>
+                                  </th:block>
+                                </th:block>
+                              </select>
+                            </div>
+                            <div class="col-2">
+                              <select class="form-select form-select-sm" name="titleCd">
+                                <option value="">계급 선택</option>
+                                <th:block th:each="code:${session.commonCode.get('JT')}">
+                                  <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${searchParams.titleCd eq code.itemCd}"></option>
+                                </th:block>
+                              </select>
+                            </div>
+                            <div class="col-2">
+                              <select class="form-select form-select-sm" name="dutyCd">
+                                <option value="">직책 선택</option>
+                                <th:block th:each="code:${session.commonCode.get('DT')}">
+                                  <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${searchParams.dutyCd eq code.itemCd}"></option>
+                                </th:block>
+                              </select>
+                            </div>
+                            <div class="col-4"></div>
+                            <div class="col-2">
+                              <select class="form-select form-select-sm" name="outturnCd">
+                                <option value="">경과 선택</option>
+                                <th:block th:each="code:${session.commonCode.get('OTC')}">
+                                  <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${searchParams.outturnCd eq code.itemCd}"></option>
+                                </th:block>
+                              </select>
+                            </div>
+                            <div class="col-2">
+                              <select class="form-select form-select-sm" name="seriesCd">
+                                <option value="">직별 선택</option>
+                                <th:block th:each="parent:${session.commonCode.get('OTC')}">
+                                  <th:block th:each="code:${session.commonCode.get(parent.itemCd)}">
+                                    <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${searchParams.seriesCd eq code.itemCd}"></option>
+                                  </th:block>
+                                </th:block>
+                              </select>
+                            </div>
+                            <div class="col-2">
+                              <select class="form-select form-select-sm" name="sex">
+                                <option value="">성별</option>
+                                <th:block th:each="code:${session.commonCode.get('SEX')}">
+                                  <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${searchParams.sex eq code.itemCd}"></option>
+                                </th:block>
+                              </select>
+                            </div>
+                            <div class="col-2">
+                              <input type="text" class="form-control form-control-sm" placeholder="이름" name="userNm" th:value="${searchParams.userNm}">
+                            </div>
+                          </div>
                         </div>
-                        <div class="col-auto">
-                          <select class="form-select form-select-sm" name="sex">
-                            <option value="">성별</option>
-                            <th:block th:each="commonCode:${session.commonCode.get('SEX')}">
-                              <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${searchParams.sex eq commonCode.itemCd}"></option>
-                            </th:block>
-                          </select>
-                        </div>
-                        <div class="col-auto">
-                          <input type="text" class="form-control form-control-sm" placeholder="이름" name="userNm" th:value="${searchParams.userNm}">
-                        </div>
-                        <div class="col-auto">
+                        <div class="col-1 d-grid gap-2">
                           <input type="submit" class="btn btn-sm btn-primary" id="searchBtn" value="검색">
                         </div>
                       </div>
diff --git a/src/main/resources/templates/police/police/historyValueDiv.html b/src/main/resources/templates/police/police/historyValueDiv.html
index dc196821..8565a626 100644
--- a/src/main/resources/templates/police/police/historyValueDiv.html
+++ b/src/main/resources/templates/police/police/historyValueDiv.html
@@ -63,8 +63,8 @@
   <div class="col-sm-2">
     <select class="form-select form-select-sm bg-white" disabled>
       <option value="">--선택--</option>
-      <th:block th:each="code:${session.commonCode.get('OFC')}">
-        <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.ofcCd}"></option>
+      <th:block th:each="code:${session.commonCode.get(userInfo.ogCd)}">
+        <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${userInfo.ofcCd eq code.itemCd}"></option>
       </th:block>
     </select>
   </div>
diff --git a/src/main/resources/templates/police/police/policeEditModal.html b/src/main/resources/templates/police/police/policeEditModal.html
index 577a3b69..a1eb8eea 100644
--- a/src/main/resources/templates/police/police/policeEditModal.html
+++ b/src/main/resources/templates/police/police/policeEditModal.html
@@ -83,7 +83,7 @@
           <div class="col-sm-2">
             <select class="form-select form-select-sm" id="ofcCd" name="ofcCd" disabled>
               <option value="">--선택--</option>
-              <th:block th:each="code:${session.commonCode.get('OFC')}">
+              <th:block th:each="code:${session.commonCode.get(userInfo.ogCd)}">
                 <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.ofcCd}"></option>
               </th:block>
             </select>
diff --git a/src/main/resources/templates/publicBoard/board/boardPage.html b/src/main/resources/templates/publicBoard/board/boardPage.html
index df87551a..c1019023 100644
--- a/src/main/resources/templates/publicBoard/board/boardPage.html
+++ b/src/main/resources/templates/publicBoard/board/boardPage.html
@@ -87,7 +87,7 @@
                           <th:block th:each="commonCode:${session.commonCode.get('OG')}">
                             <td th:if="${board.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
                           </th:block>
-                          <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
+                          <th:block th:each="commonCode:${session.commonCode.get(board.wrtOrgan)}">
                             <td th:if="${board.wrtPart eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
                           </th:block>
                           <th:block th:each="commonCode:${session.commonCode.get('JT')}">
diff --git a/src/main/resources/templates/publicBoard/board/boardViewModal.html b/src/main/resources/templates/publicBoard/board/boardViewModal.html
index 82034f67..7b41f23c 100644
--- a/src/main/resources/templates/publicBoard/board/boardViewModal.html
+++ b/src/main/resources/templates/publicBoard/board/boardViewModal.html
@@ -109,7 +109,7 @@
                 <th:block th:each="commonCode:${session.commonCode.get('OG')}">
                   <div class="col-auto" th:if="${commonCode.itemCd eq comment.wrtOrgan}" th:text="${commonCode.itemValue}"></div>
                 </th:block>
-                <!--<th:block th:each="commonCode:${session.commonCode.get('OFC')}">
+                <!--<th:block th:each="commonCode:${session.commonCode.get(comment.wrtOrgan)}">
                   <div class="col-auto" th:if="${commonCode.itemCd eq comment.wrtPart}" th:text="${commonCode.itemValue}"></div>
                 </th:block>-->
                 <th:block th:each="commonCode:${session.commonCode.get('JT')}">
@@ -142,7 +142,7 @@
                     <th:block th:each="commonCode:${session.commonCode.get('OG')}">
                       <div class="col-auto" th:if="${commonCode.itemCd eq childComment.wrtOrgan}" th:text="${commonCode.itemValue}"></div>
                     </th:block>
-                    <!--<th:block th:each="commonCode:${session.commonCode.get('OFC')}">
+                    <!--<th:block th:each="commonCode:${session.commonCode.get(childComment.wrtOrgan)}">
                       <div class="col-auto" th:if="${commonCode.itemCd eq childComment.wrtPart}" th:text="${commonCode.itemValue}"></div>
                     </th:block>-->
                     <th:block th:each="commonCode:${session.commonCode.get('JT')}">
diff --git a/src/main/resources/templates/publicBoard/commentDiv.html b/src/main/resources/templates/publicBoard/commentDiv.html
index b0aa019d..5e564c78 100644
--- a/src/main/resources/templates/publicBoard/commentDiv.html
+++ b/src/main/resources/templates/publicBoard/commentDiv.html
@@ -20,7 +20,7 @@
         <th:block th:each="commonCode:${session.commonCode.get('OG')}">
           <div class="col-auto" th:if="${commonCode.itemCd eq comment.wrtOrgan}" th:text="${commonCode.itemValue}"></div>
         </th:block>
-        <!--<th:block th:each="commonCode:${session.commonCode.get('OFC')}">
+        <!--<th:block th:each="commonCode:${session.commonCode.get(comment.wrtOrgan)}">
           <div class="col-auto" th:if="${commonCode.itemCd eq comment.wrtPart}" th:text="${commonCode.itemValue}"></div>
         </th:block>-->
         <th:block th:each="commonCode:${session.commonCode.get('JT')}">
@@ -54,7 +54,7 @@
         <th:block th:each="commonCode:${session.commonCode.get('OG')}">
           <div class="col-auto" th:if="${commonCode.itemCd eq comment.wrtOrgan}" th:text="${commonCode.itemValue}"></div>
         </th:block>
-        <!--<th:block th:each="commonCode:${session.commonCode.get('OFC')}">
+        <!--<th:block th:each="commonCode:${session.commonCode.get(comment.wrtOrgan)}">
           <div class="col-auto" th:if="${commonCode.itemCd eq childComment.wrtPart}" th:text="${commonCode.itemValue}"></div>
         </th:block>-->
         <th:block th:each="commonCode:${session.commonCode.get('JT')}">
diff --git a/src/main/resources/templates/publicBoard/notice/noticePage.html b/src/main/resources/templates/publicBoard/notice/noticePage.html
index 499492e4..bc919d06 100644
--- a/src/main/resources/templates/publicBoard/notice/noticePage.html
+++ b/src/main/resources/templates/publicBoard/notice/noticePage.html
@@ -92,7 +92,7 @@
                           <th:block th:each="commonCode:${session.commonCode.get('OG')}">
                             <td th:if="${notice.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
                           </th:block>
-                          <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
+                          <th:block th:each="commonCode:${session.commonCode.get(notice.wrtOrgan)}">
                             <td th:if="${notice.wrtPart eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
                           </th:block>
                           <th:block th:each="commonCode:${session.commonCode.get('JT')}">
diff --git a/src/main/resources/templates/publicBoard/notice/noticeViewModal.html b/src/main/resources/templates/publicBoard/notice/noticeViewModal.html
index cbc1f0bf..a330a3f4 100644
--- a/src/main/resources/templates/publicBoard/notice/noticeViewModal.html
+++ b/src/main/resources/templates/publicBoard/notice/noticeViewModal.html
@@ -109,7 +109,7 @@
                 <th:block th:each="commonCode:${session.commonCode.get('OG')}">
                   <div class="col-auto" th:if="${commonCode.itemCd eq comment.wrtOrgan}" th:text="${commonCode.itemValue}"></div>
                 </th:block>
-                <!--<th:block th:each="commonCode:${session.commonCode.get('OFC')}">
+                <!--<th:block th:each="commonCode:${session.commonCode.get(comment.wrtOrgan)}">
                   <div class="col-auto" th:if="${commonCode.itemCd eq comment.wrtPart}" th:text="${commonCode.itemValue}"></div>
                 </th:block>-->
                 <th:block th:each="commonCode:${session.commonCode.get('JT')}">
@@ -142,7 +142,7 @@
                     <th:block th:each="commonCode:${session.commonCode.get('OG')}">
                       <div class="col-auto" th:if="${commonCode.itemCd eq childComment.wrtOrgan}" th:text="${commonCode.itemValue}"></div>
                     </th:block>
-                    <!--<th:block th:each="commonCode:${session.commonCode.get('OFC')}">
+                    <!--<th:block th:each="commonCode:${session.commonCode.get(childComment.wrtOrgan)}">
                       <div class="col-auto" th:if="${commonCode.itemCd eq childComment.wrtPart}" th:text="${commonCode.itemValue}"></div>
                     </th:block>-->
                     <th:block th:each="commonCode:${session.commonCode.get('JT')}">
diff --git a/src/main/resources/templates/publicBoard/qna/qnaPage.html b/src/main/resources/templates/publicBoard/qna/qnaPage.html
index 96c03c2e..cebef107 100644
--- a/src/main/resources/templates/publicBoard/qna/qnaPage.html
+++ b/src/main/resources/templates/publicBoard/qna/qnaPage.html
@@ -88,7 +88,7 @@
                           <th:block th:each="commonCode:${session.commonCode.get('OG')}">
                             <td th:if="${qna.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
                           </th:block>
-                          <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
+                          <th:block th:each="commonCode:${session.commonCode.get(qna.wrtOrgan)}">
                             <td th:if="${qna.wrtPart eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
                           </th:block>
                           <th:block th:each="commonCode:${session.commonCode.get('JT')}">
diff --git a/src/main/resources/templates/publicBoard/qna/qnaViewModal.html b/src/main/resources/templates/publicBoard/qna/qnaViewModal.html
index 61015d6e..03a7eeb7 100644
--- a/src/main/resources/templates/publicBoard/qna/qnaViewModal.html
+++ b/src/main/resources/templates/publicBoard/qna/qnaViewModal.html
@@ -106,14 +106,14 @@
             </div>
             <div class="col-auto">
               <div class="row">
-                <th:block th:each="commonCode:${session.commonCode.get('OG')}">
-                  <div class="col-auto" th:if="${commonCode.itemCd eq comment.wrtOrgan}" th:text="${commonCode.itemValue}"></div>
+                <th:block th:each="code:${session.commonCode.get('OG')}">
+                  <div class="col-auto" th:if="${code.itemCd eq comment.wrtOrgan}" th:text="${code.itemValue}"></div>
                 </th:block>
-                <!--<th:block th:each="commonCode:${session.commonCode.get('OFC')}">
+                <!--<th:block th:each="commonCode:${session.commonCode.get(comment.wrtOrgan)}">
                   <div class="col-auto" th:if="${commonCode.itemCd eq comment.wrtPart}" th:text="${commonCode.itemValue}"></div>
                 </th:block>-->
-                <th:block th:each="commonCode:${session.commonCode.get('JT')}">
-                  <div class="col-auto" th:if="${commonCode.itemCd eq comment.wrtUserGrd}" th:text="${commonCode.itemValue}"></div>
+                <th:block th:each="code:${session.commonCode.get('JT')}">
+                  <div class="col-auto" th:if="${code.itemCd eq comment.wrtUserGrd}" th:text="${code.itemValue}"></div>
                 </th:block>
                 <div class="col-auto" th:text="${comment.wrtUserNm}"></div>
                 <div class="col-auto" th:text="${#temporals.format(comment.wrtDt, 'yyyy-MM-dd HH:mm')}"></div>
@@ -142,7 +142,7 @@
                     <th:block th:each="commonCode:${session.commonCode.get('OG')}">
                       <div class="col-auto" th:if="${commonCode.itemCd eq childComment.wrtOrgan}" th:text="${commonCode.itemValue}"></div>
                     </th:block>
-                    <!--<th:block th:each="commonCode:${session.commonCode.get('OFC')}">
+                    <!--<th:block th:each="commonCode:${session.commonCode.get(childComment.wrtOrgan)}">
                       <div class="col-auto" th:if="${commonCode.itemCd eq childComment.wrtPart}" th:text="${commonCode.itemValue}"></div>
                     </th:block>-->
                     <th:block th:each="commonCode:${session.commonCode.get('JT')}">
diff --git a/src/main/resources/templates/publicBoard/reference/referencePage.html b/src/main/resources/templates/publicBoard/reference/referencePage.html
index 4a030db1..bc9bd7c9 100644
--- a/src/main/resources/templates/publicBoard/reference/referencePage.html
+++ b/src/main/resources/templates/publicBoard/reference/referencePage.html
@@ -92,15 +92,21 @@
                     <td align="left" th:text="${reference.title}"></td>
                     <td th:text="${reference.fileCnt eq null?'파일 없음':#strings.concat(reference.fileCnt,' 건')}"></td>
                     <td th:text="${reference.commentCnt eq null?'0':reference.commentCnt}"></td>
-                    <th:block th:each="commonCode:${session.commonCode.get('OG')}">
-                      <td th:if="${reference.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                    </th:block>
-                    <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
-                      <td th:if="${reference.wrtPart eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                    </th:block>
-                    <th:block th:each="commonCode:${session.commonCode.get('JT')}">
-                      <td th:if="${reference.wrtUserGrd eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                    </th:block>
+                    <td>
+                      <th:block th:each="commonCode:${session.commonCode.get('OG')}">
+                        <th:block th:if="${reference.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
+                      </th:block>
+                    </td>
+                    <td>
+                      <th:block th:each="commonCode:${session.commonCode.get(reference.wrtOrgan)}">
+                        <th:block th:if="${reference.wrtPart eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
+                      </th:block>
+                    </td>
+                    <td>
+                      <th:block th:each="commonCode:${session.commonCode.get('JT')}">
+                        <th:block th:if="${reference.wrtUserGrd eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
+                      </th:block>
+                    </td>
                     <td th:text="${reference.wrtUserNm}"></td>
                     <td th:text="${#temporals.format(reference.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
                   </tr>
diff --git a/src/main/resources/templates/publicBoard/reference/referenceViewModal.html b/src/main/resources/templates/publicBoard/reference/referenceViewModal.html
index 05ed67fa..58c99440 100644
--- a/src/main/resources/templates/publicBoard/reference/referenceViewModal.html
+++ b/src/main/resources/templates/publicBoard/reference/referenceViewModal.html
@@ -115,7 +115,7 @@
                 <th:block th:each="commonCode:${session.commonCode.get('OG')}">
                   <div class="col-auto" th:if="${commonCode.itemCd eq comment.wrtOrgan}" th:text="${commonCode.itemValue}"></div>
                 </th:block>
-                <!--<th:block th:each="commonCode:${session.commonCode.get('OFC')}">
+                <!--<th:block th:each="commonCode:${session.commonCode.get(comment.wrtOrgan)}">
                   <div class="col-auto" th:if="${commonCode.itemCd eq comment.wrtPart}" th:text="${commonCode.itemValue}"></div>
                 </th:block>-->
                 <th:block th:each="commonCode:${session.commonCode.get('JT')}">
@@ -148,7 +148,7 @@
                     <th:block th:each="commonCode:${session.commonCode.get('OG')}">
                       <div class="col-auto" th:if="${commonCode.itemCd eq childComment.wrtOrgan}" th:text="${commonCode.itemValue}"></div>
                     </th:block>
-                    <!--<th:block th:each="commonCode:${session.commonCode.get('OFC')}">
+                    <!--<th:block th:each="commonCode:${session.commonCode.get(childComment.wrtOrgan)}">
                       <div class="col-auto" th:if="${commonCode.itemCd eq childComment.wrtPart}" th:text="${commonCode.itemValue}"></div>
                     </th:block>-->
                     <th:block th:each="commonCode:${session.commonCode.get('JT')}">
diff --git a/src/main/resources/templates/sri/readUserRow.html b/src/main/resources/templates/sri/readUserRow.html
index bf76f099..f6120146 100644
--- a/src/main/resources/templates/sri/readUserRow.html
+++ b/src/main/resources/templates/sri/readUserRow.html
@@ -12,7 +12,7 @@
     <th:block th:each="commonCode:${session.commonCode.get('OG')}">
       <th:block th:if="${commonCode.itemCd eq readUser.ogCd}" th:text="${commonCode.itemValue}"></th:block>
     </th:block>
-    <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
+    <th:block th:each="commonCode:${session.commonCode.get(readUser.ogCd)}">
       <th:block th:if="${commonCode.itemCd eq readUser.ofcCd}" th:text="${commonCode.itemValue}"></th:block>
     </th:block>
     <!--<th:block th:each="commonCode:${session.commonCode.get('JT')}">
diff --git a/src/main/resources/templates/sri/sriBoard.html b/src/main/resources/templates/sri/sriBoard.html
index 4eb70872..40019070 100644
--- a/src/main/resources/templates/sri/sriBoard.html
+++ b/src/main/resources/templates/sri/sriBoard.html
@@ -103,12 +103,16 @@
 <!--                    <td class="sriChk"><input type="checkbox" name="sriChk" class="trChkBox"></td>-->
                     <td th:text="${cnt.count}"></td>
                     <td th:text="${sri.title}"></td>
-                    <th:block th:each="commonCode:${session.commonCode.get('OG')}">
-                      <td th:if="${sri.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                    </th:block>
-                    <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
-                      <td th:if="${sri.wrtPart eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
-                    </th:block>
+                    <td>
+                      <th:block th:each="commonCode:${session.commonCode.get('OG')}">
+                        <th:block th:if="${sri.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
+                      </th:block>
+                    </td>
+                    <td>
+                      <th:block th:each="commonCode:${session.commonCode.get(sri.wrtOrgan)}">
+                        <th:block th:if="${sri.wrtPart eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></th:block>
+                      </th:block>
+                    </td>
                     <td>
                       <th:block th:each="commonCode:${session.commonCode.get('SRI')}">
                         <th:text th:if="${commonCode.itemCd eq sri.faSriType}" th:text="${commonCode.itemValue}"></th:text>
diff --git a/src/main/resources/templates/sri/sriEditModal.html b/src/main/resources/templates/sri/sriEditModal.html
index 660d7271..1664db4f 100644
--- a/src/main/resources/templates/sri/sriEditModal.html
+++ b/src/main/resources/templates/sri/sriEditModal.html
@@ -110,7 +110,7 @@
                   <th:block th:each="commonCode:${session.commonCode.get('OG')}">
                     <th:block th:if="${commonCode.itemCd eq readUser.ogCd}" th:text="${commonCode.itemValue}"></th:block>
                   </th:block>
-                  <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
+                  <th:block th:each="commonCode:${session.commonCode.get(readUser.ogCd)}">
                     <th:block th:if="${commonCode.itemCd eq readUser.ofcCd}" th:text="${commonCode.itemValue}"></th:block>
                   </th:block>
                   <!--<th:block th:each="commonCode:${session.commonCode.get('JT')}">
diff --git a/src/main/resources/templates/sri/sriViewModal.html b/src/main/resources/templates/sri/sriViewModal.html
index 164b7d36..7bbfde71 100644
--- a/src/main/resources/templates/sri/sriViewModal.html
+++ b/src/main/resources/templates/sri/sriViewModal.html
@@ -85,7 +85,7 @@
                 <th:block th:each="commonCode:${session.commonCode.get('OG')}">
                   <th:block th:if="${commonCode.itemCd eq readUser.ogCd}" th:text="${commonCode.itemValue}"></th:block>
                 </th:block>
-                <th:block th:each="commonCode:${session.commonCode.get('OFC')}">
+                <th:block th:each="commonCode:${session.commonCode.get(readUser.ogCd)}">
                   <th:block th:if="${commonCode.itemCd eq readUser.ofcCd}" th:text="${commonCode.itemValue}"></th:block>
                 </th:block>
                 <!--<th:block th:each="commonCode:${session.commonCode.get('JT')}">
diff --git a/src/main/resources/templates/user/myInfo.html b/src/main/resources/templates/user/myInfo.html
index c150d006..a9cbf2c2 100644
--- a/src/main/resources/templates/user/myInfo.html
+++ b/src/main/resources/templates/user/myInfo.html
@@ -126,7 +126,7 @@
                       <div class="col-sm-2">
                         <select class="form-select form-select-sm" id="ofcCd" name="ofcCd" th:disabled="${!#strings.isEmpty(userInfo.dicCode)}">
                           <option value="">--선택--</option>
-                          <th:block th:each="code:${session.commonCode.get('OFC')}">
+                          <th:block th:each="code:${session.commonCode.get(userInfo.ogCd)}">
                             <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq userInfo.ofcCd}"></option>
                           </th:block>
                         </select>