인사시스템 정보에 ldeptnm이 null 인 경우 회원가입 오류 수정.
parent
57b9e31c1f
commit
423f896c39
|
|
@ -28,6 +28,8 @@ public class VEmployee {
|
||||||
private String sexcd;
|
private String sexcd;
|
||||||
@Column(name = "BIRTHDT")
|
@Column(name = "BIRTHDT")
|
||||||
private String birthdt;
|
private String birthdt;
|
||||||
|
@Column(name = "TDEPTNM")
|
||||||
|
private String tdeptnm;
|
||||||
@Column(name = "LDEPTNM")
|
@Column(name = "LDEPTNM")
|
||||||
private String ldeptnm;
|
private String ldeptnm;
|
||||||
@Column(name = "JIKGUBNM")
|
@Column(name = "JIKGUBNM")
|
||||||
|
|
|
||||||
|
|
@ -46,6 +46,20 @@ public class KwmsService extends EgovAbstractServiceImpl {
|
||||||
if (positionAry.length>1){
|
if (positionAry.length>1){
|
||||||
userInfo.setOfcCd(codeMgtService.searchCodeToCategoryAndValue(userInfo.getOgCd(), positionAry[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()));
|
userInfo.setTitleCd(codeMgtService.searchCodeToCategoryAndValue("JT", empInfo.getJikgubnm()));
|
||||||
if(empInfo.getKyunggwa()!=null){
|
if(empInfo.getKyunggwa()!=null){
|
||||||
|
|
|
||||||
|
|
@ -29,6 +29,8 @@ public class CodeMgt implements Serializable{
|
||||||
private String useChk;
|
private String useChk;
|
||||||
@Column(name = "order_num")
|
@Column(name = "order_num")
|
||||||
private Integer orderNum;
|
private Integer orderNum;
|
||||||
|
@Column(name = "value_etc")
|
||||||
|
private String valueEtc;
|
||||||
|
|
||||||
@Transient
|
@Transient
|
||||||
private String status;
|
private String status;
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@ public interface CodeMgtRepository extends JpaRepository<CodeMgt, CodeMgt.CodeMg
|
||||||
List<CodeMgt> findByCategoryCdOrderByItemCdAsc(String categoryCd);
|
List<CodeMgt> findByCategoryCdOrderByItemCdAsc(String categoryCd);
|
||||||
List<CodeMgt> findByCategoryCdAndUseChkOrderByOrderNumAsc(String categoryCd, String useChk);
|
List<CodeMgt> findByCategoryCdAndUseChkOrderByOrderNumAsc(String categoryCd, String useChk);
|
||||||
Optional<CodeMgt> findByCategoryCdAndItemValue(String categoryCd, String itemValue);
|
Optional<CodeMgt> findByCategoryCdAndItemValue(String categoryCd, String itemValue);
|
||||||
|
Optional<CodeMgt> findByCategoryCdAndValueEtc(String categoryCd, String valueEtc);
|
||||||
List<CodeMgt> findByUseChkOrderByItemCdAsc(String useChk);
|
List<CodeMgt> findByUseChkOrderByItemCdAsc(String useChk);
|
||||||
List<CodeMgt> findByOrderByOrderNumAscItemCdAsc();
|
List<CodeMgt> findByOrderByOrderNumAscItemCdAsc();
|
||||||
Optional<CodeMgt> findTop1ByCategoryCdOrderByItemCdDesc(String categoryCd);
|
Optional<CodeMgt> findTop1ByCategoryCdOrderByItemCdDesc(String categoryCd);
|
||||||
|
|
|
||||||
|
|
@ -128,6 +128,14 @@ public class CodeMgtService extends EgovAbstractServiceImpl {
|
||||||
return code.getItemCd();
|
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() {
|
public List<CodeCatg> selectAllCategoryList() {
|
||||||
return codeCatgRepository.findAllByOrderByCategoryCd();
|
return codeCatgRepository.findAllByOrderByCategoryCd();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue