From 111916ed304ccc2c2bb0a16a423de8120de6bc6f Mon Sep 17 00:00:00 2001 From: leebeomjun Date: Tue, 19 Dec 2023 11:30:33 +0900 Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD=20=ED=99=94=EB=A9=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cokr/xit/fims/base/UserController.java | 8 +++- .../fims/cmmn/service/bean/FactionBean.java | 21 ++++++++--- .../sql/mapper/fims/cmmn/faction-mapper.xml | 6 ++- .../WEB-INF/jsp/base/user/user-info.jsp | 11 ++++-- .../WEB-INF/jsp/fims/user/password-info.jsp | 37 +++++++++++++++++++ .../WEB-INF/jsp/fims/user/user-info.jsp | 11 ++++-- src/main/webapp/WEB-INF/jsp/include/top.jsp | 23 ++++++++++-- 7 files changed, 98 insertions(+), 19 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/fims/user/password-info.jsp diff --git a/src/main/java/cokr/xit/fims/base/UserController.java b/src/main/java/cokr/xit/fims/base/UserController.java index a9302aae..8fd2feb0 100644 --- a/src/main/java/cokr/xit/fims/base/UserController.java +++ b/src/main/java/cokr/xit/fims/base/UserController.java @@ -82,7 +82,7 @@ public class UserController extends cokr.xit.base.user.web.UserController infoMap = userInfo.getInfo(); - infoMap.put("sggCd", factionInfo.string("SGG_CD")); - infoMap.put("sggNm", factionInfo.string("SGG_NM")); - infoMap.put("instCd", factionInfo.string("INST_CD")); - infoMap.put("instNm", factionInfo.string("INST_NM")); - infoMap.put("deptCd", factionInfo.string("DEPT_CD")); - infoMap.put("deptNm", factionInfo.string("DEPT_NM")); + if(factionInfo == null) { + infoMap.put("sggCd", ""); + infoMap.put("sggNm", ""); + infoMap.put("instCd", ""); + infoMap.put("instNm", ""); + infoMap.put("deptCd", ""); + infoMap.put("deptNm", ""); + } else { + infoMap.put("sggCd", factionInfo.string("SGG_CD")); + infoMap.put("sggNm", factionInfo.string("SGG_NM")); + infoMap.put("instCd", factionInfo.string("INST_CD")); + infoMap.put("instNm", factionInfo.string("INST_NM")); + infoMap.put("deptCd", factionInfo.string("DEPT_CD")); + infoMap.put("deptNm", factionInfo.string("DEPT_NM")); + } userInfo.setInfo(infoMap); } diff --git a/src/main/resources/sql/mapper/fims/cmmn/faction-mapper.xml b/src/main/resources/sql/mapper/fims/cmmn/faction-mapper.xml index 631c0c5e..b2f8fe9c 100644 --- a/src/main/resources/sql/mapper/fims/cmmn/faction-mapper.xml +++ b/src/main/resources/sql/mapper/fims/cmmn/faction-mapper.xml @@ -30,6 +30,8 @@ SELECT CONCAT(A.INST_CD,'/',B.DEPT_CD) AS FACTION_CD , A.INST_NM , B.DEPT_CD , B.DEPT_NM + , A.SGG_CD + , A.SGG_NM FROM TB_SGG A LEFT OUTER JOIN TB_DEPT B ON (A.INST_CD = B.INST_CD) @@ -43,6 +45,8 @@ SELECT 'default/default' AS FACTION_CD , '기본 기관' AS INST_NM , 'default' AS DEPT_CD , '기본 부서' AS DEPT_NM + , 'default' AS SGG_CD + , '기본 시군구' AS SGG_NM FROM DUAL @@ -56,7 +60,7 @@ SELECT S.SGG_CD , U.DEPT_CD , D.DEPT_NM FROM TB_USER U - INNER JOIN TB_SGG S ON (U.ORG_ID = S.SGG_CD) + LEFT OUTER JOIN TB_SGG S ON (U.ORG_ID = S.SGG_CD) LEFT OUTER JOIN TB_DEPT D ON (U.DEPT_CD = D.DEPT_CD) WHERE U.USER_ID = #{userId} diff --git a/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp b/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp index 82b35edb..300e17f2 100644 --- a/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp +++ b/src/main/webapp/WEB-INF/jsp/base/user/user-info.jsp @@ -18,7 +18,7 @@
  • ${item.FACTION_NM} + onclick="setFactionCodeValues('${item.INST_CD}','${item.DEPT_CD}','${item.SGG_CD}')">${item.FACTION_NM}
    • @@ -38,6 +38,7 @@ + @@ -245,9 +246,11 @@ function saveinfoPrefix() { }); } -function setFactionCodeValues(institute, deptCode){ - $("#infoPrefix-form [name='institute']").val(institute).trigger("change") - $("#infoPrefix-form [name='deptCode']").val(deptCode).trigger("change") +function setFactionCodeValues(institute, deptCode, sggCd){ + $("#infoPrefix-form [name='institute']").val(institute).trigger("change"); + $("#infoPrefix-form [name='deptCode']").val(deptCode).trigger("change"); + + $("#infoPrefix-form [name='orgID']").val(sggCd); } //# sourceURL=user-info.jsp diff --git a/src/main/webapp/WEB-INF/jsp/fims/user/password-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/user/password-info.jsp new file mode 100644 index 00000000..17221477 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/fims/user/password-info.jsp @@ -0,0 +1,37 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> +<%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> + +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    \ 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 e6a96426..43eef868 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 @@ -53,7 +53,7 @@
  • ${item.FACTION_NM} + onclick="setFactionCodeValues('${item.INST_CD}','${item.DEPT_CD}','${item.SGG_CD}')">${item.FACTION_NM}
    • @@ -73,6 +73,7 @@ + @@ -315,9 +316,11 @@ function save(info){ }); } -function setFactionCodeValues(institute, deptCode){ - $("#user-form [name='institute']").val(institute).trigger("change") - $("#user-form [name='deptCode']").val(deptCode).trigger("change") +function setFactionCodeValues(institute, deptCode, sggCd){ + $("#user-form [name='institute']").val(institute).trigger("change"); + $("#user-form [name='deptCode']").val(deptCode).trigger("change"); + + $("#user-form [name='orgID']").val(sggCd); } var userInfo = ${userInfo}; diff --git a/src/main/webapp/WEB-INF/jsp/include/top.jsp b/src/main/webapp/WEB-INF/jsp/include/top.jsp index 53bf4a39..964171be 100644 --- a/src/main/webapp/WEB-INF/jsp/include/top.jsp +++ b/src/main/webapp/WEB-INF/jsp/include/top.jsp @@ -104,13 +104,13 @@
  • - + 계정 정보 수정
    • -
  • - +
  • + 비밀번호 변경 @@ -186,6 +186,23 @@ function fnOpenMyInfo(){ ); } +function fnOpenChangePassword(){ + ajax.get({ + url : wctx.url("/user/openChangePassword.do"), + data : { }, + success : (resp) => { + dialog.open({ + id : "changePasswordDialog", + title : "비밀번호 변경", + content : resp, + size : "md", + init : () => {}, + onClose : () => {} + }); + } + }); +} + function showHelp(){ dialog.alert({ content: '070-4490-74XX',