Merge remote-tracking branch 'origin/master'

This commit is contained in:
jazz
2025-12-26 11:09:10 +09:00
9 changed files with 46 additions and 31 deletions

View File

@@ -322,13 +322,15 @@ public class BOJobUserService {
// 일치하면 1, 불일치하면 0 반환
log.debug("encodedPwd:{}", encodedPwd);
log.debug("newPwd:{}", newPwd);
if (encodedPwd.equals(newPwd)) {
result = 1;
} else {
result = 0;
}
log.debug("result:{}", result);
} catch (WnbtRestException wre){
throw new WnbtRestException(wre.getMessage());
} catch (Exception e) {

View File

@@ -33,6 +33,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Matcher;
@@ -150,10 +151,15 @@ public class SetupMngrInfoController {
/*비밀번호 체크*/
if("Y".equals(vo.getPwChngAt())){
/*1 비밀번호 변경 시 현재 비밀번호 확인*/
Map<String, Object> resultMap = responseHandler.handleResponseAsMap(
sendToResrc.ofPost(RESRC.GCONEBO, "/admin/user/mngr/selectBOJobUserPasswordInqire", vo)
);
int result = (int) resultMap.get("result");
// Map<String, Object> resultMap = responseHandler.handleResponseAsMap(
// sendToResrc.ofPost(RESRC.GCONEBO, "/admin/user/mngr/selectBOJobUserPasswordInqire", vo)
// );
BOJobUserVO uvo = new BOJobUserVO();
uvo.setMngrInnb(vo.getMngrInnb());
uvo.setPassword(vo.getPassword());
Integer result = jobUserService.selectBOJobUserPasswordInqire(uvo);;
if(result == 0){
throw new WnbtRestException("현재 비밀번호가 일치하지 않습니다");
}