From 423f896c391b044fe6fd22df98a0cb738e25cdb9 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: Mon, 29 Apr 2024 17:05:59 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B8=EC=82=AC=EC=8B=9C=EC=8A=A4=ED=85=9C?=
 =?UTF-8?q?=20=EC=A0=95=EB=B3=B4=EC=97=90=20ldeptnm=EC=9D=B4=20null=20?=
 =?UTF-8?q?=EC=9D=B8=20=EA=B2=BD=EC=9A=B0=20=ED=9A=8C=EC=9B=90=EA=B0=80?=
 =?UTF-8?q?=EC=9E=85=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

---
 .../java/com/dbnt/faisp/kwms/model/VEmployee.java  |  2 ++
 .../com/dbnt/faisp/kwms/service/KwmsService.java   | 14 ++++++++++++++
 .../com/dbnt/faisp/main/codeMgt/model/CodeMgt.java |  2 ++
 .../main/codeMgt/repository/CodeMgtRepository.java |  1 +
 .../faisp/main/codeMgt/service/CodeMgtService.java |  8 ++++++++
 5 files changed, 27 insertions(+)

diff --git a/src/main/java/com/dbnt/faisp/kwms/model/VEmployee.java b/src/main/java/com/dbnt/faisp/kwms/model/VEmployee.java
index 083dfcb9..a6c468e7 100644
--- a/src/main/java/com/dbnt/faisp/kwms/model/VEmployee.java
+++ b/src/main/java/com/dbnt/faisp/kwms/model/VEmployee.java
@@ -28,6 +28,8 @@ public class VEmployee {
   private String sexcd;
   @Column(name = "BIRTHDT")
   private String birthdt;
+  @Column(name = "TDEPTNM")
+  private String tdeptnm;
   @Column(name = "LDEPTNM")
   private String ldeptnm;
   @Column(name = "JIKGUBNM")
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 5be60376..10326bc3 100644
--- a/src/main/java/com/dbnt/faisp/kwms/service/KwmsService.java
+++ b/src/main/java/com/dbnt/faisp/kwms/service/KwmsService.java
@@ -46,6 +46,20 @@ public class KwmsService extends EgovAbstractServiceImpl {
       if (positionAry.length>1){
         userInfo.setOfcCd(codeMgtService.searchCodeToCategoryAndValue(userInfo.getOgCd(), positionAry[1]));
       }
+    }else{
+      String[] positionAry = empInfo.getTdeptnm().split(" ");
+      String ogCd = null;
+      String ofcValue = null;
+      for(String value: positionAry){
+        String temp = codeMgtService.searchCodeToCategoryAndValueEtc("OG", value);
+        if(temp == null){
+          ofcValue = value;
+        }else{
+          ogCd = temp;
+        }
+      }
+      userInfo.setOgCd(ogCd);
+      userInfo.setOfcCd(codeMgtService.searchCodeToCategoryAndValue(ogCd, ofcValue));
     }
     userInfo.setTitleCd(codeMgtService.searchCodeToCategoryAndValue("JT", empInfo.getJikgubnm()));
     if(empInfo.getKyunggwa()!=null){
diff --git a/src/main/java/com/dbnt/faisp/main/codeMgt/model/CodeMgt.java b/src/main/java/com/dbnt/faisp/main/codeMgt/model/CodeMgt.java
index 5c225ddf..5e7be821 100644
--- a/src/main/java/com/dbnt/faisp/main/codeMgt/model/CodeMgt.java
+++ b/src/main/java/com/dbnt/faisp/main/codeMgt/model/CodeMgt.java
@@ -29,6 +29,8 @@ public class CodeMgt implements Serializable{
   private String useChk;
   @Column(name = "order_num")
   private Integer orderNum;
+  @Column(name = "value_etc")
+  private String valueEtc;
 
   @Transient
   private String status;
diff --git a/src/main/java/com/dbnt/faisp/main/codeMgt/repository/CodeMgtRepository.java b/src/main/java/com/dbnt/faisp/main/codeMgt/repository/CodeMgtRepository.java
index 5a330b42..23c744a3 100644
--- a/src/main/java/com/dbnt/faisp/main/codeMgt/repository/CodeMgtRepository.java
+++ b/src/main/java/com/dbnt/faisp/main/codeMgt/repository/CodeMgtRepository.java
@@ -12,6 +12,7 @@ public interface CodeMgtRepository extends JpaRepository<CodeMgt, CodeMgt.CodeMg
   List<CodeMgt> findByCategoryCdOrderByItemCdAsc(String categoryCd);
   List<CodeMgt> findByCategoryCdAndUseChkOrderByOrderNumAsc(String categoryCd, String useChk);
   Optional<CodeMgt> findByCategoryCdAndItemValue(String categoryCd, String itemValue);
+  Optional<CodeMgt> findByCategoryCdAndValueEtc(String categoryCd, String valueEtc);
   List<CodeMgt> findByUseChkOrderByItemCdAsc(String useChk);
   List<CodeMgt> findByOrderByOrderNumAscItemCdAsc();
   Optional<CodeMgt> findTop1ByCategoryCdOrderByItemCdDesc(String categoryCd);
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 a1b63cf2..3b1094b4 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
@@ -128,6 +128,14 @@ public class CodeMgtService extends EgovAbstractServiceImpl {
     return code.getItemCd();
   }
 
+  public String searchCodeToCategoryAndValueEtc(String categoryCd, String valueEtc){
+    CodeMgt code = codeMgtRepository.findByCategoryCdAndValueEtc(categoryCd, valueEtc).orElse(null);
+    if (code == null){
+      return null;
+    }
+    return code.getItemCd();
+  }
+
   public List<CodeCatg> selectAllCategoryList() {
     return codeCatgRepository.findAllByOrderByCategoryCd();
   }