예산편성 오류 수정 등.

src/main/java/com/dbnt/faisp/main/budget/BudgetController.java

@@ -137,30 +137,21 @@ public class BudgetController {
       mav.addObject("list", list);
     } else {
       // 로그인된 해당청 기본선택
-      userOrgCode = userInfoService.selectUserInfo(loginUser.getUserSeq()).getOgCd();
+      userOrgCode = loginUser.getOgCd();
-      String HighOrgCode = budgetService.selectGetHighOrgCode(userOrgCode);
-      if (HighOrgCode == null) {              // 1, 2단계시
       requestDto.setCode(userOrgCode);
-      } else {                                // 3단계 이하 관서시
-        requestDto.setCode(HighOrgCode);
-        userOrgCode = HighOrgCode;
-      }
 
       mav.addObject("list");
 
       // 첫해 첫날 ~ 오늘날짜 기본세팅
       LocalDate date = LocalDate.now();
-      String CurrentYear = String.valueOf(date.getYear()) + "-01-01";
+      String CurrentYear = date.getYear() + "-01-01";
       requestDto.setStDate(LocalDate.parse(CurrentYear));
       requestDto.setEdDate(date);
     }
     //하위청 리스트
     List<CodeResult> downOrgList = budgetService.selectDownOrg(userOrgCode);
     mav.addObject("downOrgList", downOrgList);
-
+    mav.addObject("loginOrgan", loginUser.getOgCd());
-    //Select box 관서 리스트
-    List<CodeResult> codeList = budgetService.selectGetLowerOrgCodeByName(loginUser);
-    mav.addObject("codeList", codeList);
 
     mav.addObject("searchParams", requestDto);
 
@@ -228,14 +219,8 @@ public class BudgetController {
       mav.addObject("list", list);
     } else {
       // 로그인된 해당청 기본선택
-      userOrgCode = userInfoService.selectUserInfo(loginUser.getUserSeq()).getOgCd();
+      userOrgCode = loginUser.getOgCd();
-      String HighOrgCode = budgetService.selectGetHighOrgCode(userOrgCode);
-      if (HighOrgCode == null) {              // 1, 2단계시
       requestDto.setCode(userOrgCode);
-      } else {                                // 3단계 이하 관서시
-        requestDto.setCode(HighOrgCode);
-        userOrgCode = HighOrgCode;
-      }
 
       mav.addObject("list");
 
@@ -249,9 +234,6 @@ public class BudgetController {
     List<CodeResult> downOrgList = budgetService.selectDownOrg(userOrgCode);
     mav.addObject("downOrgList", downOrgList);
 
-    List<CodeResult> codeList = budgetService.selectGetLowerOrgCodeByName(loginUser);
-    mav.addObject("codeList", codeList);
-
     mav.addObject("searchParams", requestDto);
 
     return mav;

src/main/java/com/dbnt/faisp/main/budget/mapper/BudgetMapper.java

@@ -18,6 +18,7 @@ public interface BudgetMapper {
   List<AssignResult> selectBudgetAssignInfoList(BudgetParams params);
   List<AssignAmount> selectBudgetAssignAmountList(BudgetParams params);
   List<CodeResult> callSpGetDownOrg(BudgetParams param);
+  List<CodeResult> selectDownOrgList(BudgetParams params);
   List<CodeResult> callSpGetLowerOrgCodeByName();
   String callSpGetHighOrgCode(BudgetParams params);
   UpdateResult callSpAddBudgetAssign(BudgetParams params);

src/main/java/com/dbnt/faisp/main/budget/service/BudgetService.java

@@ -350,7 +350,8 @@ public class BudgetService {
 //        return budgetRepository.callSpGetDownOrg(userOrgCode);
     BudgetParams params = new BudgetParams();
     params.setOrg(userOrgCode);
-    return budgetMapper.callSpGetDownOrg(params);
+//    return budgetMapper.callSpGetDownOrg(params);
+    return budgetMapper.selectDownOrgList(params);
   }
 
   //

src/main/resources/mybatisMapper/BudgetMapper.xml

@@ -73,6 +73,8 @@
         ) tba on tba.l_org_code = total.l_org_code and tba.budget_code = total.budget_code
         inner join (
           select  (ROW_NUMBER() OVER()) AS order_seq, *
+          from (
+             select organ_cd
              from (
                 select #{code} as organ_cd
                 union all
@@ -80,6 +82,9 @@
                 from organ_config
                 where parent_organ = #{code}
                   ) a
+                inner join code_mgt b on a.organ_cd = b.item_cd
+             order by b.order_num
+               ) a
         ) oc on total.l_org_code = oc.organ_cd
     order by order_seq, organ_cd, budget_code
   </select>
@@ -88,6 +93,19 @@
            org_name as orgName  
     from sp_get_down_org(#{org})
   </select>
+  <select id="selectDownOrgList" resultType="CodeResult" parameterType="BudgetParams">
+    select a.organ_cd as orgCode,
+           b.item_value as orgName
+    from (
+           select #{org} as organ_cd
+           union all
+           select organ_cd
+           from organ_config
+           where parent_organ = #{org}
+         ) a
+           inner join code_mgt b on a.organ_cd = b.item_cd
+    order by b.order_num
+  </select>
   <select id="callSpGetLowerOrgCodeByName" resultType="CodeResult" parameterType="BudgetParams">
     select org_code as orgCode, 
            org_name as orgName 

src/main/resources/templates/budget/assign.html

@@ -35,13 +35,17 @@
               <div class="col-auto">
                 <div class="row justify-content-end">
                   <div class="col-auto">
-                    <select class="form-select form-select-sm" name="code" id="code">>
+                    <th:block th:if="${loginOrgan eq 'OG001'}">
+                      <select class="form-select form-select-sm" name="code" id="code">
                         <option value="OG001">본청</option>
-                      <option th:each="code : ${codeList}" th:value="${code?.orgCode}"
+                        <option th:each="code : ${downOrgList}" th:value="${code?.orgCode}"
-                              th:text="${code?.orgName}"
+                                th:text="${code?.orgName}" th:selected="${searchParams?.code eq code.orgCode}">
-                              th:selected="${searchParams?.code eq code.orgCode}">2023
                         </option>
                       </select>
+                    </th:block>
+                    <th:block th:unless="${loginOrgan eq 'OG001'}">
+                      <input type="hidden" name="code" id="code" th:value="${loginOrgan}">
+                    </th:block>
                   </div>
                   <div class="col-auto">
                     <div class="input-group w-auto input-daterange" id="dateSelectorDiv">