From d185921828cfb70c431c82162c8936770297b126 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=A0=EC=A7=80=EC=9D=B8?= Date: Thu, 12 Mar 2026 11:22:28 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B0=9C=EC=A3=BC=EA=B8=B0=EA=B4=80=20?= =?UTF-8?q?=EC=8B=A0=EA=B7=9C=EB=93=B1=EB=A1=9D=20=ED=9B=84=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=EA=B0=B1=EC=8B=A0=20=EB=B0=8F=201=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=9D=B4=EB=8F=99=20=EB=B0=9C=EC=A3=BC?= =?UTF-8?q?=EA=B8=B0=EA=B4=80=20=EC=A0=95=EB=B3=B4=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=EC=B0=BD=EC=97=90=EC=84=9C=20=EC=A0=95=ED=99=95=ED=95=9C=20?= =?UTF-8?q?=EB=B0=9C=EC=A3=BC=EA=B8=B0=EA=B4=80=20=EC=A0=95=EB=B3=B4=20?= =?UTF-8?q?=ED=91=9C=EC=8B=9C=EB=A5=BC=20=EC=9C=84=ED=95=9C=20=EC=BF=BC?= =?UTF-8?q?=EB=A6=AC=20=EB=B3=B4=EC=99=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mappers/admins/user/GeneralUserMng_SQL.xml | 17 ++++++----------- .../05_addUser.jsp | 8 ++++++-- .../constructionProjectManagement/editUser.jsp | 2 +- .../webapp/WEB-INF/views/admins/user/02.jsp | 2 +- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/main/resources/geoinfo/sqlmap/mappers/admins/user/GeneralUserMng_SQL.xml b/src/main/resources/geoinfo/sqlmap/mappers/admins/user/GeneralUserMng_SQL.xml index 0c24ca7..23f957b 100644 --- a/src/main/resources/geoinfo/sqlmap/mappers/admins/user/GeneralUserMng_SQL.xml +++ b/src/main/resources/geoinfo/sqlmap/mappers/admins/user/GeneralUserMng_SQL.xml @@ -113,17 +113,12 @@ DECODE(PROJECT_MASTER_COMPANY_CODE,'','0',PROJECT_MASTER_COMPANY_CODE) MASTER_COMPANY_CODE, CLS, AGREEYN, - DIS.GL_CODE, - DIS.GM_CODE, - DIS.GS_CODE, - DIS.GF_CODE + TMC.GL_CODE, + TMC.GM_CODE, + TMC.GS_CODE, + TMC.GF_CODE FROM WEB_MEMBER_IN A - LEFT JOIN (SELECT * - FROM (SELECT DIS.* - ,ROW_NUMBER() OVER (PARTITION BY DISTRICT ORDER BY DISTRICT) RN - FROM TBL_DISTRICT DIS - WHERE USE_YN = 'Y') - WHERE RN = 1) DIS ON DIS.DISTRICT = A.COMPANY_NAME + LEFT JOIN TBL_MASTER_COMPANY TMC ON TMC.COM_CODE = A.PROJECT_MASTER_COMPANY_CODE WHERE TRIM(USERID) = #{userId} ]]> @@ -166,7 +161,7 @@ INSERT INTO WEB_MEMBER_IN ( USERID, PASSWD, USER_NAME, PHONE, EMAIL, COMPANY_NAME, PART_NAME, ADDRESS, CLS, PROJECT_MASTER_COMPANY_CODE, LAST_LOGIN_DATE, LOGIN_COUNT, AGREEYN, ENCRYPT_CHANGE, LIQ_YN, GOVEMENT_CODE, CERTIFICATION_YN ) VALUES( - #{userid}, #{encPasswd}, #{userName}, #{phone}, #{email}, #{companyName}, #{partName}, #{address}, '2', (SELECT COM_CODE FROM TBL_MASTER_COMPANY WHERE COM_NAME = #{companyName}), SYSDATE, 0, 'Y', 'Y', 'N', 0, 0 + #{userid}, #{encPasswd}, #{userName}, #{phone}, #{email}, #{companyName}, #{partName}, #{address}, '2', (SELECT COM_CODE FROM TBL_MASTER_COMPANY WHERE COM_NAME LIKE '%' || #{companyName} || '%'), SYSDATE, 0, 'Y', 'Y', 'N', 0, 0 ) diff --git a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/05_addUser.jsp b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/05_addUser.jsp index abb017f..d4a580d 100644 --- a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/05_addUser.jsp +++ b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/05_addUser.jsp @@ -375,7 +375,11 @@ button { success:function(json){ if(json.resultCnt != 0) { alert("발주기관 신규 계정이 등록되었습니다."); - window.close(); + // 팝업에서 처리 성공 후 + if (window.opener && !window.opener.closed) { + window.opener.linkPage(1); + window.close(); + } } else { alert("발주기관 신규 계정이 등록처리를 실패했습니다. 다시 시도해주시기 바랍니다."); } @@ -557,7 +561,7 @@ button { 아이디 - + diff --git a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/editUser.jsp b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/editUser.jsp index efde684..11fe334 100644 --- a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/editUser.jsp +++ b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/editUser.jsp @@ -588,7 +588,7 @@ button { 아이디 - + diff --git a/src/main/webapp/WEB-INF/views/admins/user/02.jsp b/src/main/webapp/WEB-INF/views/admins/user/02.jsp index c6c4ad3..fdd4d21 100644 --- a/src/main/webapp/WEB-INF/views/admins/user/02.jsp +++ b/src/main/webapp/WEB-INF/views/admins/user/02.jsp @@ -114,7 +114,7 @@ $(function(){ //발주기관 등록 function addClientPopup() { var url = context + "/admins/client/05_addUser.do"; - addUser = window.open(url, 'addClient','scrollbars=no,titlebar=no,width=500, height=680',true); + addUser = window.open(url, 'addClient','scrollbars=no,titlebar=no,width=690, height=640',true); addUser.focus(); }