Compare commits

..

No commits in common. "094433f9f52e9030e33d85027b8d991d8464eeb9" and "24fa44aadaccdf607a658180cfec42e7558f1527" have entirely different histories.

4 changed files with 3 additions and 49 deletions

View File

@ -43,13 +43,4 @@ public class CodeMgtService{
public List<CodeMgt> selectCommonCodeList() {
return codeMgtRepository.findByUseChkOrderByItemCdAsc("T");
}
public List<CodeMgt> selectCodeMgtOgList() {
return codeMgtRepository.findByCategoryCdOrderByItemCdAsc("OG");
}
public List<CodeMgt> selectCodeMgtOfcList() {
return codeMgtRepository.findByCategoryCdOrderByItemCdAsc("OFC");
}
}

View File

@ -2,17 +2,12 @@ package com.dbnt.faisp.controller;
import com.dbnt.faisp.userInfo.model.UserInfo;
import com.dbnt.faisp.codeMgt.CodeMgtService;
import com.dbnt.faisp.codeMgt.model.CodeCatg;
import com.dbnt.faisp.codeMgt.model.CodeMgt;
import lombok.RequiredArgsConstructor;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.ModelAndView;
import java.util.List;
import javax.servlet.http.HttpSession;
@RestController
@ -39,18 +34,14 @@ public class BaseController {
}
@GetMapping("/login")
public ModelAndView goLogin() {
public ModelAndView goLogin() {
ModelAndView mav = new ModelAndView("/login/login");
mav.addObject("OgList", codeMgtService.selectCodeMgtOgList());
mav.addObject("OfcList", codeMgtService.selectCodeMgtOfcList());
return mav;
}
@GetMapping("/login-error")
public ModelAndView loginError() {
ModelAndView mav = new ModelAndView("/login/login");
mav.addObject("OgList", codeMgtService.selectCodeMgtOgList());
mav.addObject("OfcList", codeMgtService.selectCodeMgtOfcList());
mav.addObject("loginError", true);
return mav;
}

View File

@ -35,9 +35,7 @@ function valueCheck(form){
const userId = targetForm.find("#userId").val();
const password = targetForm.find("#modalPassword");
const passwordConfirm = targetForm.find("#passwordConfirm");
const userNm = targetForm.find("#userNm").val();
const ogCd = targetForm.find("#ogCd").val();
const ofcCd = targetForm.find("#ofcCd").val();
const userNm = targetForm.find("#userNm").val()
let returnFlag = true;
if(!userId){
@ -71,18 +69,10 @@ function valueCheck(form){
}else{
if(password.val() !== passwordConfirm.val()){
alert("비밀번호가 같지 않습니다.");
returnFlag = false;
returnFlag = false;
}
}
}
}
if(!ogCd){
alert("관서를 선택해주세요.");
returnFlag = false;
}
if(!ofcCd){
alert("부서를 선택해주세요.");
returnFlag = false;
}
return returnFlag;
}

View File

@ -97,24 +97,6 @@
<input type="tel" class="form-control" id="telP">
</div>
</div>
<div class="mb-3 row">
<label for="ogCd" class="col-sm-2 col-form-label text-center">관서</label>
<div class="col-sm-4">
<select class="form-control" id="ogCd" name="ogCd">
<option value="">--선택--</option>
<option th:each="val : ${OgList}" th:value="${val?.itemCd}" th:utext="${val?.itemValue}">
</option>
</select>
</div>
<label for="ofcCd" class="col-sm-2 col-form-label text-center">부서</label>
<div class="col-sm-4">
<select class="form-control" id="ofcCd" name="ofcCd">
<option value="">--선택--</option>
<option th:each="val : ${OfcList}" th:value="${val?.itemCd}" th:utext="${val?.itemValue}">
</option>
</select>
</div>
</div>
<div class="mb-3 row" >
<label for="address" class="col-sm-2 col-form-label text-center">주소</label>
<div class="col-sm-8">