발주기관 신규등록 후 목록 갱신 및 1페이지 이동

발주기관 정보 수정 창에서 정확한 발주기관 정보 표시를 위한 쿼리 보완

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,
+		       TMC.GL_CODE,
-		       DIS.GM_CODE,
+		       TMC.GM_CODE,
-		       DIS.GS_CODE,
+		       TMC.GS_CODE,
-		       DIS.GF_CODE
+		       TMC.GF_CODE
 		FROM   WEB_MEMBER_IN A
-		LEFT JOIN (SELECT *
+		LEFT JOIN TBL_MASTER_COMPANY TMC ON TMC.COM_CODE = A.PROJECT_MASTER_COMPANY_CODE 
-				   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 
 		WHERE  TRIM(USERID) = #{userId}
 	]]>
 	</select>
@@ -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
 		)
 	</insert>
 	

src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/05_addUser.jsp

@@ -375,7 +375,11 @@ button {
 			success:function(json){
 				if(json.resultCnt != 0) {
 					alert("발주기관 신규 계정이 등록되었습니다.");
+					// 팝업에서 처리 성공 후
+					if (window.opener && !window.opener.closed) {
+					    window.opener.linkPage(1);
 					    window.close();
+					}
 				} else {
 					alert("발주기관 신규 계정이 등록처리를 실패했습니다. 다시 시도해주시기 바랍니다.");
 				}
@@ -557,7 +561,7 @@ button {
 					<tr>
 						<th class="th-head">아이디</th>
 						<td colspan=3 class="t-left td_client_id">
-							<input name="client_id" type="text" class="client_id" id="client_id" maxlength="10" value="" placeholder="아이디를 입력해주세요" onChange="javascript:validEle(this);"> 
+							<input name="client_id" type="text" class="client_id" id="client_id" maxlength="20" value="" placeholder="아이디를 입력해주세요" onChange="javascript:validEle(this);"> 
 							<button id="clientDuplChkBtn" type="button">중복체크</button>
 						</td>
 					</tr>

src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/editUser.jsp

@@ -588,7 +588,7 @@ button {
 					<tr>
 						<th class="th-head">아이디</th>
 						<td colspan=3 class="t-left td_client_id">
-							<input name="client_id" type="text" class="client_id" id="client_id" maxlength="10" value="${client.userid}" placeholder="아이디를 입력해주세요" onChange="javascript:validEle(this);"> 
+							<input name="client_id" type="text" class="client_id" id="client_id" maxlength="20" value="${client.userid}" placeholder="아이디를 입력해주세요" onChange="javascript:validEle(this);"> 
 							<button id="clientDuplChkBtn" type="button">중복체크</button>
 						</td>
 					</tr>

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();
 }