From 49030cf4c58f344c87cd223391bcbdfb87d68740 Mon Sep 17 00:00:00 2001
From: leebj <leebj91@xit.co.kr>
Date: Tue, 25 Jun 2024 10:13:10 +0900
Subject: [PATCH] =?UTF-8?q?=EB=B9=84=EB=B0=80=EB=B2=88=ED=98=B8=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=ED=99=94=EB=A9=B4jsp=EB=AA=85=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95,=20FimsUserBean=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cokr/xit/fims/base/UserController.java    | 20 ------------------
 .../fims/base/service/bean/FimsUserBean.java  | 15 -------------
 .../resources/sql/mapper/base/user-mapper.xml |  8 +++++--
 .../user/password.jsp}                        | 21 ++++++-------------
 .../WEB-INF/jsp/fims/user/user-info.jsp       |  2 +-
 src/main/webapp/WEB-INF/jsp/include/top.jsp   |  2 +-
 6 files changed, 14 insertions(+), 54 deletions(-)
 delete mode 100644 src/main/java/cokr/xit/fims/base/service/bean/FimsUserBean.java
 rename src/main/webapp/WEB-INF/jsp/{fims/user/password-info.jsp => base/user/password.jsp} (86%)

diff --git a/src/main/java/cokr/xit/fims/base/UserController.java b/src/main/java/cokr/xit/fims/base/UserController.java
index 0d9abacb..60ecae9e 100644
--- a/src/main/java/cokr/xit/fims/base/UserController.java
+++ b/src/main/java/cokr/xit/fims/base/UserController.java
@@ -23,9 +23,6 @@ public class UserController extends cokr.xit.base.user.web.UserController<Manage
 	@Resource(name="userService")
 	private UserService userService;
 
-	@Resource(name="fimsUserBean")
-	private cokr.xit.fims.base.service.bean.FimsUserBean fimsUserBean;
-
 	@Resource(name = "codeBean")
 	private CodeBean codeBean;
 
@@ -121,23 +118,6 @@ public class UserController extends cokr.xit.base.user.web.UserController<Manage
 		return super.update(user);
 	}
 
-	@RequestMapping(name="비밀번호 변경 화면",value="/openChangePassword.do")
-	public ModelAndView openChangePassword() {
-		ModelAndView mav = new ModelAndView("fims/user/password-info");
-
-		return mav;
-	}
-
-	@RequestMapping(name="비밀번호 확인",value="/confirmPassword.do")
-	public ModelAndView confirmPassword(String password) {
-		ModelAndView mav = new ModelAndView("jsonView");
-
-		boolean result = false;
-		result = fimsUserBean.confirmPassword(password);
-		mav.addObject("result", result);
-		return mav;
-	}
-
 	@RequestMapping(name="기본업무 저장",value="/saveDefaultTask.do")
 	public ModelAndView saveDefaultTask(String taskSeCd) {
 		ModelAndView mav = new ModelAndView("jsonView");
diff --git a/src/main/java/cokr/xit/fims/base/service/bean/FimsUserBean.java b/src/main/java/cokr/xit/fims/base/service/bean/FimsUserBean.java
deleted file mode 100644
index dca0b8f0..00000000
--- a/src/main/java/cokr/xit/fims/base/service/bean/FimsUserBean.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package cokr.xit.fims.base.service.bean;
-
-import org.springframework.stereotype.Component;
-
-import cokr.xit.foundation.User;
-
-@Component("fimsUserBean")
-public class FimsUserBean extends cokr.xit.base.user.service.bean.UserBean {
-
-	public boolean confirmPassword(String password) {
-		User user = this.getUser(currentUser().getAccount(), currentUser().getInstitute());
-		return user.getPassword().equals(passwordEncoder.encode(password));
-	}
-
-}
diff --git a/src/main/resources/sql/mapper/base/user-mapper.xml b/src/main/resources/sql/mapper/base/user-mapper.xml
index 9c9f400a..a0121f28 100644
--- a/src/main/resources/sql/mapper/base/user-mapper.xml
+++ b/src/main/resources/sql/mapper/base/user-mapper.xml
@@ -99,8 +99,12 @@ SELECT USER_ID
 <select id="getUser" parameterType="map" resultMap="userRow">/* 사용자 계정 가져오기(userMapper.getUser) */
 SELECT *
   FROM TB_USER
- WHERE USER_ACNT = #{account}
-   AND NSTT_CD = #{institute}</select>
+<where>
+<if test="userID != null">AND USER_ID = #{userID}</if>
+<if test="account != null">AND USER_ACNT = #{account}</if>
+<if test="institute != null">   AND NSTT_CD = #{institute}</if>
+</where>
+</select>
 
 <insert id="insertUser" parameterType="cokr.xit.base.user.ManagedUser">
 <selectKey resultType="string" keyProperty="id" keyColumn="NEW_ID" order="BEFORE">SELECT LPAD(NVL(MAX(USER_ID) + 1, 1), 10, '0') NEW_ID FROM TB_USER</selectKey>
diff --git a/src/main/webapp/WEB-INF/jsp/fims/user/password-info.jsp b/src/main/webapp/WEB-INF/jsp/base/user/password.jsp
similarity index 86%
rename from src/main/webapp/WEB-INF/jsp/fims/user/password-info.jsp
rename to src/main/webapp/WEB-INF/jsp/base/user/password.jsp
index 60126945..b85daa90 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/user/password-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/base/user/password.jsp
@@ -72,26 +72,18 @@
 			return;
 		}
 		
-		ajax.get({
-			url : wctx.url("/user/confirmPassword.do"),
-			data : { password : $("#password-form input[name='currentPassword']").val() },
-			success : (resp) => {
-				if(resp.result){
-					savePassword();
-				} else {
-					dialog.alert("현재 비밀번호가 일치하지 않습니다.");
-				}
-			}
-		});
-	
+		savePassword();
 	}
 	
 	function savePassword(){
+		
 		ajax.post({
 			url : wctx.url("/user/changePassword.do"),
 			data : { 
-				userID : MY_INFO.id,
-				password : $("#password-form input[name='password']").val() 
+				userIDs : MY_INFO.id,
+				password : $("#password-form input[name='password']").val(),
+				currentPassword : $("#password-form input[name='currentPassword']").val(),
+				init : false
 			},
 			success : (resp) => {
 				if(resp.saved){
@@ -102,6 +94,5 @@
 				}
 			}
 		});
-		
 	}
 </script>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/fims/user/user-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/user/user-info.jsp
index 3050023a..3129827b 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/user/user-info.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/user/user-info.jsp
@@ -112,7 +112,7 @@
 				</div>
 			</div>
 		</div>
-		<div class="col-md-6 hidden">
+		<div class="col-md-6">
 			<div class="row">
 				<label class="col-sm-3 col-form-label text-sm-end required" for="confirmPassword">
 				비밀번호 확인
diff --git a/src/main/webapp/WEB-INF/jsp/include/top.jsp b/src/main/webapp/WEB-INF/jsp/include/top.jsp
index 5acceb8f..9b4acb9a 100644
--- a/src/main/webapp/WEB-INF/jsp/include/top.jsp
+++ b/src/main/webapp/WEB-INF/jsp/include/top.jsp
@@ -343,7 +343,7 @@ function fnOpenMyInfo(){
 
 function fnOpenChangePassword(){
 	ajax.get({
-		url : wctx.url("/user/openChangePassword.do"),
+		url : wctx.url("/user/changePassword.do"),
 		data : { },
 		success : (resp) => {
 			dialog.open({