From 3e5687b86e5700492d8bae3a0fbc8d9a12d154af Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Tue, 13 Jun 2023 10:11:29 +0900
Subject: [PATCH] no message

---
 .../resources/sql/mapper/base/authority-mapper.xml   | 12 ++++++++----
 .../webapp/WEB-INF/jsp/base/authority/user-list.jsp  |  2 +-
 src/main/webapp/WEB-INF/jsp/index.jsp                |  2 +-
 .../css/fims/framework/common/xit-core-extend.css    |  4 ++--
 src/main/webapp/resources/js/base/base.js            |  2 +-
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/sql/mapper/base/authority-mapper.xml b/src/main/resources/sql/mapper/base/authority-mapper.xml
index 184312f3..0ff4d748 100644
--- a/src/main/resources/sql/mapper/base/authority-mapper.xml
+++ b/src/main/resources/sql/mapper/base/authority-mapper.xml
@@ -104,10 +104,14 @@ SELECT A.AUTH_ID
 
 <sql id="selectAuthUser">
 <include refid="utility.paging-prefix" />
-SELECT *
-  FROM TB_AUTH_USER
-<if test="authIDs != null">WHERE AUTH_ID IN (<foreach collection="authIDs" item="authID" separator=",">#{authID}</foreach>)</if>
-<if test="userIDs != null">WHERE USER_ID IN (<foreach collection="userIDs" item="userID" separator=",">#{userID}</foreach>)</if>
+SELECT A.*, USER_ACNT
+  FROM TB_AUTH_USER A
+     , TB_USER B
+<where>
+<if test="authIDs != null">AND AUTH_ID IN (<foreach collection="authIDs" item="authID" separator=",">#{authID}</foreach>)</if>
+<if test="userIDs != null">AND A.USER_ID IN (<foreach collection="userIDs" item="userID" separator=",">#{userID}</foreach>)</if>
+   AND A.USER_ID = B.USER_ID
+</where>
 <include refid="utility.orderBy"/>
 <include refid="utility.paging-suffix" /></sql>
 
diff --git a/src/main/webapp/WEB-INF/jsp/base/authority/user-list.jsp b/src/main/webapp/WEB-INF/jsp/base/authority/user-list.jsp
index c1ae8cdb..a59d3e3c 100644
--- a/src/main/webapp/WEB-INF/jsp/base/authority/user-list.jsp
+++ b/src/main/webapp/WEB-INF/jsp/base/authority/user-list.jsp
@@ -18,7 +18,7 @@
                    	<template id="userRow">
                    	<tr data-key="{AUTH_ID}-{USER_ID}">
                        <td style="text-align:center;"><input value="{AUTH_ID}-{USER_ID}" onchange="${infoPrefix}Control.users.select('{AUTH_ID}-{USER_ID}', this.checked);" type="checkbox" class="form-check-input"></td>
-                       <td onclick="${infoPrefix}Control.users.setCurrent('{AUTH_ID}-{USER_ID}')">{USER_ID}</td>
+                       <td onclick="${infoPrefix}Control.users.setCurrent('{AUTH_ID}-{USER_ID}')">{USER_ACNT}</td>
                        <td onclick="${infoPrefix}Control.users.setCurrent('{AUTH_ID}-{USER_ID}">{REG_DT}</td>
                     </tr>
                     </template>
diff --git a/src/main/webapp/WEB-INF/jsp/index.jsp b/src/main/webapp/WEB-INF/jsp/index.jsp
index 3930cc8d..2c6b2066 100644
--- a/src/main/webapp/WEB-INF/jsp/index.jsp
+++ b/src/main/webapp/WEB-INF/jsp/index.jsp
@@ -11,7 +11,7 @@
                 <div id="tabsForInnerPage" class="nav-align-top mt-3">
 		            <ul class="nav nav-tabs nav-tabs-ifr"></ul>
 		        </div>
-		        <div id="ifrTabContents" class="tab-content"></div>
+		        <div id="innerPageTabContents" class="tab-content"></div>
 		        
             </div>
         </div>
diff --git a/src/main/webapp/resources/css/fims/framework/common/xit-core-extend.css b/src/main/webapp/resources/css/fims/framework/common/xit-core-extend.css
index b65a5588..19ce016d 100644
--- a/src/main/webapp/resources/css/fims/framework/common/xit-core-extend.css
+++ b/src/main/webapp/resources/css/fims/framework/common/xit-core-extend.css
@@ -34,11 +34,11 @@
     width: min-content;
 }
 
-#ifrTabContents {
+#innerPageTabContents {
     height : calc( 100% - 2.2rem );
 }
 
-#ifrTabContents > div {
+#innerPageTabContents > div {
     height : 100%;
 }
 
diff --git a/src/main/webapp/resources/js/base/base.js b/src/main/webapp/resources/js/base/base.js
index 6e969f09..e6871582 100644
--- a/src/main/webapp/resources/js/base/base.js
+++ b/src/main/webapp/resources/js/base/base.js
@@ -688,7 +688,7 @@ class FormFields {
 				if (value && value == input.value)
 					input.checked = true;
 			} else {
-				input.value = value || "";
+				input.value = ifEmpty(value, "");
 			}			
 		});
 	}