From 0206c002e2e1a6eda0671ade974f621e3372b075 Mon Sep 17 00:00:00 2001
From: ham sangki <sangkiham@naver.com>
Date: Mon, 15 Apr 2024 18:14:49 +0900
Subject: [PATCH] 2024-04-15

---
 prestige-vue-4.0.0/src/layout/AppFooter.vue                               |  35 +++--------------------------------
 prestige-vue-4.0.0/src/layout/AppTopbar.vue                               |  63 ++++++++++-----------------------------------------------------
 prestige-vue-4.0.0/src/main.js                                            |   3 ++-
 prestige-vue-4.0.0/src/router/index.js                                    |  57 ++++-----------------------------------------------------
 prestige-vue-4.0.0/src/service/AgGridService.js                           | 107 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 prestige-vue-4.0.0/src/service/MenuDataService.js                         |   8 +-------
 prestige-vue-4.0.0/src/service/axios.js                                   |   2 +-
 prestige-vue-4.0.0/src/service/login.js                                   |   4 ++++
 prestige-vue-4.0.0/src/store/index.js                                     |  14 ++++++++++++++
 prestige-vue-4.0.0/src/views/basic/Basic1.vue                             | 174 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 prestige-vue-4.0.0/src/views/basic/Basic2.vue                             | 133 -------------------------------------------------------------------------------------------------------------------------------------
 prestige-vue-4.0.0/src/views/basic/Basic3.vue                             |  26 --------------------------
 prestige-vue-4.0.0/src/views/basic/Basic4.vue                             | 156 ------------------------------------------------------------------------------------------------------------------------------------------------------------
 prestige-vue-4.0.0/src/views/basic/Basic5.vue                             | 123 ---------------------------------------------------------------------------------------------------------------------------
 prestige-vue-4.0.0/src/views/system/Authority.vue                         | 126 ------------------------------------------------------------------------------------------------------------------------------
 prestige-vue-4.0.0/src/views/system/SystemCode.vue                        |  57 +++++++++++++++++++++++++++++++++++++++++++++------------
 prestige-vue-4.0.0/src/views/system/User.vue                              | 547 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 prestige-vue-4.0.0/src/views/system/UserAuthority.vue                     | 267 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/main/java/daeucna/config/security/JwtSecurityConfig.java              |   2 +-
 src/main/java/daeucna/config/security/SecurityConfig.java                 |  16 +++++++++++-----
 src/main/java/daeucna/config/security/controller/ExceptionController.java |   2 +-
 src/main/java/daeucna/config/security/controller/UserController.java      |   2 +-
 src/main/java/daeucna/config/security/jwt/JwtAccessDeniedHandler.java     |  20 ++++++++++++++++++++
 src/main/java/daeucna/config/security/jwt/JwtTokenProvider.java           |  13 +++++++++----
 src/main/java/daeucna/mapper/primary/system/UserMapper.java               |  24 ++++++++++++++++++++++++
 src/main/java/daeucna/system/code/CodeServiceImpl.java                    |   4 ++--
 src/main/java/daeucna/system/user/UserAuthorityDto.java                   |  12 ++++++++++++
 src/main/java/daeucna/system/user/UserAuthoritySaveDto.java               |  11 +++++++++++
 src/main/java/daeucna/system/user/UserController.java                     |  64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/main/java/daeucna/system/user/UserDto.java                            |  14 ++++++++++++++
 src/main/java/daeucna/system/user/UserSaveDto.java                        |  11 +++++++++++
 src/main/java/daeucna/system/user/UserService.java                        |  21 +++++++++++++++++++++
 src/main/java/daeucna/system/user/UserServiceImpl.java                    | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/main/java/daeucna/utils/ConvertUtil.java                              |  33 +++++++++++++++++++++++++++++++++
 src/main/java/daeucna/utils/DateUtil.java                                 | 574 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/main/java/daeucna/utils/JsonUtil.java                                 |  19 +++++++++++++++++++
 src/main/java/daeucna/utils/StringUtil.java                               | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/main/resources/application.properties                                 |   6 +++---
 src/main/resources/data.sql                                               |  12 ++++++++----
 src/main/resources/mybatis/mybatis-config.xml                             |   2 ++
 src/main/resources/mybatis/primary/system/UserMapper.xml                  | 127 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/main/resources/schema.sql                                             |   9 ++++-----
 42 files changed, 1903 insertions(+), 1218 deletions(-)
 create mode 100644 prestige-vue-4.0.0/src/service/AgGridService.js
 delete mode 100644 prestige-vue-4.0.0/src/views/basic/Basic1.vue
 delete mode 100644 prestige-vue-4.0.0/src/views/basic/Basic2.vue
 delete mode 100644 prestige-vue-4.0.0/src/views/basic/Basic3.vue
 delete mode 100644 prestige-vue-4.0.0/src/views/basic/Basic4.vue
 delete mode 100644 prestige-vue-4.0.0/src/views/basic/Basic5.vue
 delete mode 100644 prestige-vue-4.0.0/src/views/system/Authority.vue
 create mode 100644 prestige-vue-4.0.0/src/views/system/UserAuthority.vue
 create mode 100644 src/main/java/daeucna/config/security/jwt/JwtAccessDeniedHandler.java
 create mode 100644 src/main/java/daeucna/mapper/primary/system/UserMapper.java
 create mode 100644 src/main/java/daeucna/system/user/UserAuthorityDto.java
 create mode 100644 src/main/java/daeucna/system/user/UserAuthoritySaveDto.java
 create mode 100644 src/main/java/daeucna/system/user/UserController.java
 create mode 100644 src/main/java/daeucna/system/user/UserDto.java
 create mode 100644 src/main/java/daeucna/system/user/UserSaveDto.java
 create mode 100644 src/main/java/daeucna/system/user/UserService.java
 create mode 100644 src/main/java/daeucna/system/user/UserServiceImpl.java
 create mode 100644 src/main/java/daeucna/utils/ConvertUtil.java
 create mode 100644 src/main/java/daeucna/utils/DateUtil.java
 create mode 100644 src/main/java/daeucna/utils/JsonUtil.java
 create mode 100644 src/main/java/daeucna/utils/StringUtil.java
 create mode 100644 src/main/resources/mybatis/primary/system/UserMapper.xml

diff --git a/prestige-vue-4.0.0/src/layout/AppFooter.vue b/prestige-vue-4.0.0/src/layout/AppFooter.vue
index 797ea7c..2f76a15 100644
--- a/prestige-vue-4.0.0/src/layout/AppFooter.vue
+++ b/prestige-vue-4.0.0/src/layout/AppFooter.vue
@@ -1,38 +1,9 @@
 <template>
     <div class="layout-footer">
         <div class="grid">
-            <div class="col-12 md:col-6 lg:col-3">
-                <span class="logo">Prestige</span>
-                <p>PrimeVue Premium Template</p>
-            </div>
-            <div class="col-12 md:col-6 lg:col-3">
-                <span>LATEST TEMPLATES</span>
-                <div class="grid templates">
-                    <ul>
-                        <li><a href="https://primefaces.org/prestige-vue/" target="_blank" rel="noopener noreferrer">Prestige</a></li>
-                        <li><a href="https://primefaces.org/roma-vue/" target="_blank" rel="noopener noreferrer">Roma</a></li>
-                        <li><a href="https://primefaces.org/babylon-vue/" target="_blank" rel="noopener noreferrer">Babylon</a></li>
-                        <li><a href="https://primefaces.org/ultima-vue/" target="_blank" rel="noopener noreferrer">Ultima</a></li>
-                        <li><a href="https://primefaces.org/diamond-vue/" target="_blank" rel="noopener noreferrer">Diamond</a></li>
-                    </ul>
-                    <ul>
-                        <li><a href="https://primefaces.org/freya-vue/" target="_blank" rel="noopener noreferrer">Freya</a></li>
-                        <li><a href="https://primefaces.org/apollo-vue/" target="_blank" rel="noopener noreferrer">Apollo</a></li>
-                        <li><a href="https://primefaces.org/serenity-vue/" target="_blank" rel="noopener noreferrer">Serenity</a></li>
-                        <li><a href="https://primefaces.org/avalon-vue/" target="_blank" rel="noopener noreferrer">Avalon</a></li>
-                        <li><a href="https://primefaces.org/sapphire-vue/" target="_blank" rel="noopener noreferrer">Sapphire</a></li>
-                    </ul>
-                </div>
-            </div>
-            <div class="col-12 md:col-6 lg:col-3">
-                <span>DEMOS</span>
-                <div class="grid">
-                    <ul class="links">
-                        <li><a href="https://primefaces.org/primevue/" target="_blank" rel="noopener noreferrer">PrimeVue</a></li>
-                        <li><a href="https://primefaces.org/primeng/" target="_blank" rel="noopener noreferrer">PrimeNG</a></li>
-                        <li><a href="https://primefaces.org/primereact/" target="_blank" rel="noopener noreferrer">PrimeReact</a></li>
-                    </ul>
-                </div>
+            <div class="col-12 md:col-12 lg:col-12">
+                <span class="logo flex align-items-center justify-content-center">(주)대유씨엔에이</span>
+                <p class="flex align-items-center justify-content-center">서울특별시 성동구 성수일로 99 서울숲AK밸리 303호</p>
             </div>
         </div>
     </div>
diff --git a/prestige-vue-4.0.0/src/layout/AppTopbar.vue b/prestige-vue-4.0.0/src/layout/AppTopbar.vue
index 819bf7b..997daea 100644
--- a/prestige-vue-4.0.0/src/layout/AppTopbar.vue
+++ b/prestige-vue-4.0.0/src/layout/AppTopbar.vue
@@ -24,24 +24,6 @@
                                 <div class="layout-quickmenu-tooltip-text">{{ sampleTitle }}</div>
                             </div>
                         </li>
-                        <li>
-                            <a href="#" class="layout-topbar-icon">
-                                <i class="topbar-icon pi pi-chart-bar"></i>
-                            </a>
-                            <div class="layout-quickmenu-tooltip">
-                                <div class="layout-quickmenu-tooltip-arrow"></div>
-                                <div class="layout-quickmenu-tooltip-text">Statistics</div>
-                            </div>
-                        </li>
-                        <li>
-                            <router-link to="/logout">                                
-                                <i class="topbar-icon pi pi-sign-out"></i>
-                            </router-link>
-                            <div class="layout-quickmenu-tooltip">
-                                <div class="layout-quickmenu-tooltip-arrow"></div>
-                                <div class="layout-quickmenu-tooltip-text">Sign Out</div>
-                            </div>
-                        </li>
                     </ul>
                 </transition>
             </li>
@@ -72,24 +54,23 @@
             <li :class="[{ 'active-topmenuitem': activeTopbarItem === 'profile' }]" class="user-profile" @click="$emit('topbar-item-click', { originalEvent: $event, item: 'profile' })">
                 <a href="#">
                     <div class="user-profile-info profile-link">
-                        <span class="user-profile-name">Ava Gregoraci</span>
-                        <span class="user-profile-role">Design Ops</span>
+                        <span class="user-profile-name">{{ store.getters.getLoginId }}</span>
+                        <span class="user-profile-role">{{ store.getters.getCompanyName }}</span>
                     </div>
-                    <img class="logo" src="/layout/images/avatar/avatar-ava.jpg" alt="prestige-layout" />
+                    <i class="pi pi-android" style="font-size: 3.5rem"></i>
                 </a>
                 <transition name="layout-submenu-container">
                     <ul class="fadeInDown" v-show="activeTopbarItem === 'profile'">
-                        <li class="profile-detail">
-                            <div class="user-profile-info">
-                                <img class="logo" src="/layout/images/avatar/avatar-ava.jpg" alt="prestige-layout" />
-                                <div class="profile-info">
-                                    <span class="user-profile-name">Ava Gregoraci</span>
-                                    <span class="user-profile-role">Design Ops</span>
-                                </div>
+                        <li>
+                            <router-link to="/logout">                                
                                 <a href="#" class="profile-detail-icon">
                                     <i class="pi pi-sign-out"></i>
+                                    <div class="menu-text">
+                                        <span class="menu-title">Logout</span>
+                                        <span class="menu-subtitle">Logout from current User</span>
+                                    </div>
                                 </a>
-                            </div>
+                            </router-link>
                         </li>
                         <li>
                             <a href="#">
@@ -112,30 +93,6 @@
                                 <i class="right-icon pi pi-angle-right"></i>
                             </a>
                         </li>
-                        <li>
-                            <a href="#">
-                                <i class="pi pi-inbox"></i>
-                                <div class="menu-text">
-                                    <span class="menu-title">Messages</span>
-                                    <span class="menu-subtitle"
-                                        >You have a
-                                        <div class="blue">3 new</div>
-                                        messages</span
-                                    >
-                                </div>
-                                <i class="right-icon pi pi-angle-right"></i>
-                            </a>
-                        </li>
-                        <li>
-                            <a href="#">
-                                <i class="pi pi-globe"></i>
-                                <div class="menu-text">
-                                    <span class="menu-title">Notification</span>
-                                    <span class="menu-subtitle">No new notification</span>
-                                </div>
-                                <i class="right-icon pi pi-angle-right"></i>
-                            </a>
-                        </li>
                     </ul>
                 </transition>
             </li>
diff --git a/prestige-vue-4.0.0/src/main.js b/prestige-vue-4.0.0/src/main.js
index 3d5aa6b..3ed0edb 100644
--- a/prestige-vue-4.0.0/src/main.js
+++ b/prestige-vue-4.0.0/src/main.js
@@ -213,7 +213,8 @@ app.component('BlockViewer', BlockViewer);
 
 //ag-grid
 import "ag-grid-community/styles//ag-grid.css";
-import "ag-grid-community/styles//ag-theme-quartz.css";
+// import "ag-grid-community/styles//ag-theme-quartz.css";
+import "ag-grid-community/styles//ag-theme-balham.css";
 import { AgGridVue } from "ag-grid-vue3";
 app.component('AgGridVue', AgGridVue);
 
diff --git a/prestige-vue-4.0.0/src/router/index.js b/prestige-vue-4.0.0/src/router/index.js
index 1d0491d..aa9ca23 100644
--- a/prestige-vue-4.0.0/src/router/index.js
+++ b/prestige-vue-4.0.0/src/router/index.js
@@ -19,47 +19,6 @@ const routes = [
                 },
             },
             {
-                path: '/basic1',
-                name: 'basic1',
-                component: () => import('@/views/basic/Basic1.vue'),
-                meta: {
-                    breadcrumb: [{ parent: 'Basic', label: 'Basic1' }],
-                },
-            },
-            {
-                path: '/basic2',
-                name: 'basic2',
-                component: () => import('@/views/basic/Basic2.vue'),
-                meta: {
-                    breadcrumb: [{ parent: 'Basic', label: 'Basic2' }],
-                },
-            },
-            {
-                path: '/basic3',
-                name: 'basic3',
-                component: () => import('@/views/basic/Basic3.vue'),
-                meta: {
-                    breadcrumb: [{ parent: 'Basic', label: 'Basic3' }],
-                },
-            },
-            {
-                path: '/basic4',
-                name: 'basic4',
-                component: () => import('@/views/basic/Basic4.vue'),
-                meta: {
-                    breadcrumb: [{ parent: 'Basic', label: 'Basic4' }],
-                },
-            },
-            {
-                path: '/basic5',
-                name: 'basic5',
-                component: () => import('@/views/basic/Basic5.vue'),
-                meta: {
-                    breadcrumb: [{ parent: 'Basic', label: 'Basic5' }],
-                },
-            },
-
-            {
                 path: '/systemCode',
                 name: 'systemCode',
                 component: () => import('@/views/system/SystemCode.vue'),
@@ -76,19 +35,11 @@ const routes = [
                 },
             },
             {
-                path: '/authority',
-                name: 'authority',
-                component: () => import('@/views/system/Authority.vue'),
-                meta: {
-                    breadcrumb: [{ parent: 'System', label: 'Authority' }],
-                },
-            },
-            {
-                path: '/messages',
-                name: 'messages',
-                component: () => import('@/views/system/Messages.vue'),
+                path: '/userAuthority',
+                name: 'userAuthority',
+                component: () => import('@/views/system/UserAuthority.vue'),
                 meta: {
-                    breadcrumb: [{ parent: 'System', label: 'Messages' }],
+                    breadcrumb: [{ parent: 'System', label: 'User Authority' }],
                 },
             },
         ],
diff --git a/prestige-vue-4.0.0/src/service/AgGridService.js b/prestige-vue-4.0.0/src/service/AgGridService.js
new file mode 100644
index 0000000..cea408b
--- /dev/null
+++ b/prestige-vue-4.0.0/src/service/AgGridService.js
@@ -0,0 +1,107 @@
+const agGridService = {
+    /**
+     * 그리드의 데이타를 전체/변경된 것을 가져온다
+     * @param {*} pGridApi 
+     * @param {*} pOnlyUpdated 
+     */
+    agGridGetData: (pGridApi, pOnlyUpdated) => {
+        console.log("agGridGetData");
+        let updatedData = [];
+        let sRowStatus = "N,U,D";
+        pGridApi.value.forEachNode(rec => {
+            if (pOnlyUpdated) {
+                if (sRowStatus.indexOf(rec.data.rowStatus) != -1) {
+                    updatedData.push(rec.data);
+                }
+            } else {
+                updatedData.push(rec.data);
+            } 
+        }); 
+        return updatedData;
+    },
+
+    /**
+     * 새로운행울 추가하고 해당 결과에 대한 정보를 배열로 돌려준다
+     * @param {*} pGridApi 
+     * @returns 
+     */
+    agGridAddRow: (pGridApi, pRowCnt, pIdx) => {
+        console.log("agGridAddRow");
+        let newRows = [];
+        for (let i=0; i<pRowCnt; i++) {
+            let newData = {
+                rowStatus: "N"
+            };
+            newRows.push(newData);
+        }
+        const res = pGridApi.value.applyTransaction({
+            addIndex: pIdx,
+            add: newRows
+        });
+        return res;
+    },
+
+    /**
+     * 레코드를 삭제처리하고 결과를 돌려준다
+     * @param {*} pGridApi 
+     * @returns 
+     */
+    agGridDelRow: (pGridApi, pSelectedNodes) => {
+        console.log("agGridDelRow");
+
+        let removeNodes = [];
+        let updateNodes = [];
+        pSelectedNodes.map(
+            curNode => {
+                if (curNode.data.rowStatus === "N") {
+                    removeNodes.push(curNode.data);
+                } else {
+                    curNode.data.rowStatus = "D";
+                    updateNodes.push(curNode.data);
+                }
+            }
+        )
+
+        const res = pGridApi.value.applyTransaction({
+            remove: removeNodes,
+            update: updateNodes
+        });    
+        return res;
+    },
+
+    /**
+     * 레코드의 변경상태를 초기화 한다(신규레코드는 제외)
+     * @param {*} pGridApi 
+     * @returns 
+     */
+    agGridEraseStatusRow: (pGridApi) => {
+        console.log("agGridEraseStatusRow");
+        const selectedRows = pGridApi.value.getSelectedRows();
+
+        if ("U,D".indexOf(selectedRows[0].rowStatus) > -1) {
+            selectedRows.map(curRec => curRec.rowStatus = "");
+            const res = gridApi.value.applyTransaction({
+                update: selectedRows
+            });    
+            return res;
+        }
+
+        return res;
+    },
+
+    /**
+     * 셀변경시 상태 처리
+     * @param {*} pGridApi 
+     * @returns 
+     */
+    agGridChangeStatusRow: (pGridApi, pEvent) => {
+        console.log("onCellValueChanged");
+        if ('N,D'.indexOf(pEvent.data.rowStatus) == -1) pEvent.data.rowStatus = "U";    
+        const res = pGridApi.value.applyTransaction({
+            update: [pEvent.data]
+        });    
+
+        return res;
+    }
+}
+export default agGridService;
\ No newline at end of file
diff --git a/prestige-vue-4.0.0/src/service/MenuDataService.js b/prestige-vue-4.0.0/src/service/MenuDataService.js
index 3708575..15bcb92 100644
--- a/prestige-vue-4.0.0/src/service/MenuDataService.js
+++ b/prestige-vue-4.0.0/src/service/MenuDataService.js
@@ -7,11 +7,6 @@ export let menu =
             icon: 'pi pi-fw pi-wrench',
             ord: 2,
             items: [
-                { label: 'Basic1', icon: 'pi pi-fw pi-id-card', to: '/basic1', authrity: 'CURD', ord: 1},
-                { label: 'Basic2', icon: 'pi pi-fw pi-check-square', to: '/basic2', authrity: 'CURD', ord: 2 },
-                { label: 'Basic3', icon: 'pi pi-fw pi-bookmark', to: '/basic3', authrity: 'CURD', ord: 3 },
-                { label: 'Basic4', icon: 'pi pi-fw pi-exclamation-circle', to: '/basic4', authrity: 'CURD', ord: 4 },
-                { label: 'Basic5', icon: 'pi pi-fw pi-mobile', to: '/basic5', class: 'rotated-icon', authrity: 'CURD', ord: 5 },
             ],
         },
         {
@@ -22,8 +17,7 @@ export let menu =
             items: [
                 { label: 'System Code', icon: 'pi pi-fw pi-list', to: '/systemCode', authrity: 'CURD', ord: 1 },
                 { label: 'User', icon: 'pi pi-fw pi-users', to: '/user', authrity: 'CURD', ord: 1 },
-                { label: 'Authority', icon: 'pi pi-fw pi-id-card', to: '/authority', authrity: 'CURD', ord: 1 },
-                { label: 'Messages', icon: 'pi pi-fw pi-bars', to: '/messages', authrity: 'CURD', ord: 1 },
+                { label: 'Authority', icon: 'pi pi-fw pi-id-card', to: '/userAuthority', authrity: 'CURD', ord: 1 },
             ],
         },
     ];
diff --git a/prestige-vue-4.0.0/src/service/axios.js b/prestige-vue-4.0.0/src/service/axios.js
index 537ffd1..8011a06 100644
--- a/prestige-vue-4.0.0/src/service/axios.js
+++ b/prestige-vue-4.0.0/src/service/axios.js
@@ -27,7 +27,7 @@ axios.interceptors.response.use(function (response) {
     // Do something with response error
     console.log('에러일 경우', error.config);
     const errorAPI = error.config;
-    if((error.code != null || error.response.data.status===401) && errorAPI.retry===undefined){
+    if((error.response.status===401 || error.response.status===405) && errorAPI.retry===undefined){
       errorAPI.retry = true;
       console.log('토큰이 이상한 오류일 경우');
       await refreshToken();
diff --git a/prestige-vue-4.0.0/src/service/login.js b/prestige-vue-4.0.0/src/service/login.js
index 8d7b715..b4d6ea8 100644
--- a/prestige-vue-4.0.0/src/service/login.js
+++ b/prestige-vue-4.0.0/src/service/login.js
@@ -21,6 +21,8 @@ export async function loginForm(loginInfo, store){
         if (response.status == '200') {
             console.log('store = ' + store);
             store.commit("setLogined", true);            
+            store.commit("setCompanyName", "(주)대유씨엔에이");            
+            store.commit("setLoginId", loginInfo.username);            
         }
         return response.status;
     }catch(err){        
@@ -47,6 +49,8 @@ export async function logoutForm(store){
     console.log("refresh_token=" + VueCookies.get('refresh_token'));
 
     store.commit("setLogined", false);
+    store.commit("setCompanyName", null);            
+    store.commit("setLoginId", null);            
 
     console.log("Logout Completed");
 }
diff --git a/prestige-vue-4.0.0/src/store/index.js b/prestige-vue-4.0.0/src/store/index.js
index c4733e1..a92b3d3 100644
--- a/prestige-vue-4.0.0/src/store/index.js
+++ b/prestige-vue-4.0.0/src/store/index.js
@@ -3,10 +3,18 @@ import createPersistedState from 'vuex-persistedstate'
 
 export default createStore({
   state: {
+    companyName : null,
+    loginId : null,
     logined : false,
     samplePages : false,
   },
   getters: {
+    getCompanyName(state){
+      return state.companyName;
+    },
+    getLoginId(state){
+      return state.loginId;
+    },
     getLogined(state){
       return state.logined;
     },
@@ -15,6 +23,12 @@ export default createStore({
     }
   },
   mutations: {
+    setCompanyName(state, companyName){
+      state.companyName = companyName;
+    },
+    setLoginId(state, loginId){
+      state.loginId = loginId;
+    },
     setLogined(state, logined){
       state.logined = logined;
     },
diff --git a/prestige-vue-4.0.0/src/views/basic/Basic1.vue b/prestige-vue-4.0.0/src/views/basic/Basic1.vue
deleted file mode 100644
index fc96019..0000000
--- a/prestige-vue-4.0.0/src/views/basic/Basic1.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-<script setup>
-import { onMounted, ref } from 'vue';
-
-class CustomTextEditor {
-    constructor(props) {
-        const el = document.createElement('input');
-        const { maxLength } = props.columnInfo.editor.options;
-
-        el.type = 'text';
-        el.maxLength = maxLength;
-        el.value = String(props.value);
-
-        this.el = el;
-    }
-
-    getElement() {
-        return this.el;
-    }
-
-    getValue() {
-        return this.el.value;
-    }
-
-    mounted() {
-        this.el.select();
-    }
-}
-
-const data = ref([
-    {
-        id: '10012',
-        city: 'Seoul',
-        country: 'South Korea',
-    },
-    {
-        id: '10013',
-        city: 'Tokyo',
-        country: 'Japan',
-    },
-    {
-        id: '10014',
-        city: 'London',
-        country: 'England',
-    },
-    {
-        id: '10015',
-        city: 'Ljubljana',
-        country: 'Slovenia',
-    },
-    {
-        id: '10016',
-        city: 'Reykjavik',
-        country: 'Iceland',
-    },
-]);
-
-const columns = ref([
-    {
-        header: 'ID',
-        name: 'id',
-        editor: {
-            type: CustomTextEditor,
-            options: {
-                maxLength: 10,
-            },
-        },
-    },
-    {
-        header: 'CITY',
-        name: 'city',
-        editor: 'text',
-    },
-    {
-        header: 'COUNTRY',
-        name: 'country',
-        formatter: 'listItemText',
-        editor: {
-            type: 'select',
-            options: {
-                listItems: [
-                    { text: 'South Korea', value: 'South Korea' },
-                    { text: 'England', value: 'England' },
-                    { text: 'Japan', value: 'Japan' },
-                    { text: 'Slovenia', value: 'Slovenia' },
-                ],
-            },
-        },
-    },
-]);
-
-const GridTable = ref();
-
-onMounted(() => {
-    const grid = GridTable.value;
-    const optPreset = {
-        selection: {
-            background: '#4daaf9',
-            border: '#004082',
-        },
-        scrollbar: {
-            background: '#f5f5f5',
-            thumb: '#d9d9d9',
-            active: '#c1c1c1',
-        },
-        row: {
-            even: {
-                background: '#f3ffe3',
-            },
-            hover: {
-                background: '#ccc',
-            },
-        },
-        cell: {
-            normal: {
-                background: '#fbfbfb',
-                border: '#e0e0e0',
-                showVerticalBorder: true,
-            },
-            header: {
-                background: '#eee',
-                border: '#ccc',
-                showVerticalBorder: true,
-            },
-            rowHeader: {
-                border: '#ccc',
-                showVerticalBorder: true,
-            },
-            editable: {
-                background: '#fbfbfb',
-            },
-            selectedHeader: {
-                background: '#d8d8d8',
-            },
-            focused: {
-                border: '#418ed4',
-            },
-            disabled: {
-                text: '#b0b0b0',
-            },
-        },
-    };
-    grid?.applyTheme('striped', optPreset);
-    grid?.setLanguage('ko');
-    // const instance = grid?.gridInstance;
-    // instance?.setWidth(500);
-
-    //data Load
-    // const loginInfo = {};
-
-    // const response = getData();
-});
-</script>
-
-<template>
-    <div class="card">
-        <Accordion :activeIndex="0">
-            <AccordionTab header="Header I" class="w-full">
-                <tui-grid ref="GridTable" :data="data" :columns="columns"> </tui-grid>
-            </AccordionTab>
-            <AccordionTab header="Header II">
-                <p class="m-0">
-                    Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim
-                    ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Consectetur, adipisci velit, sed quia non numquam eius modi.
-                </p>
-            </AccordionTab>
-            <AccordionTab header="Header III">
-                <p class="m-0">
-                    At vero eos et accusamus et iusto odio dignissimos ducimus qui blanditiis praesentium voluptatum deleniti atque corrupti quos dolores et quas molestias excepturi sint occaecati cupiditate non provident, similique sunt in culpa qui
-                    officia deserunt mollitia animi, id est laborum et dolorum fuga. Et harum quidem rerum facilis est et expedita distinctio. Nam libero tempore, cum soluta nobis est eligendi optio cumque nihil impedit quo minus.
-                </p>
-            </AccordionTab>
-        </Accordion>
-    </div>
-</template>
diff --git a/prestige-vue-4.0.0/src/views/basic/Basic2.vue b/prestige-vue-4.0.0/src/views/basic/Basic2.vue
deleted file mode 100644
index e3c02f5..0000000
--- a/prestige-vue-4.0.0/src/views/basic/Basic2.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-<template>
-    <div class="grid p-fluid">
-        <div class="col-12 lg:col-6">
-            <div class="card">
-                <h5>Linear Chart</h5>
-                <Chart type="line" :data="lineData"></Chart>
-            </div>
-            <div class="card flex flex-column align-items-center">
-                <h5 class="align-self-start">Pie Chart</h5>
-                <Chart type="pie" :data="pieData" style="position: relative; width: 50%"></Chart>
-            </div>
-            <div class="card flex flex-column align-items-center">
-                <h5 class="align-self-start">Polar Area Chart</h5>
-                <Chart type="polarArea" :data="polarData" style="position: relative; width: 50%"></Chart>
-            </div>
-        </div>
-        <div class="col-12 lg:col-6">
-            <div class="card">
-                <h5>Bar Chart</h5>
-                <Chart type="bar" :data="barData"></Chart>
-            </div>
-            <div class="card flex flex-column align-items-center">
-                <h5 class="align-self-start">Doughnut Chart</h5>
-                <Chart type="doughnut" :data="pieData" style="position: relative; width: 50%"></Chart>
-            </div>
-            <div class="card flex flex-column align-items-center">
-                <h5 class="align-self-start">Radar Chart</h5>
-                <Chart type="radar" :data="radarData" style="position: relative; width: 50%"></Chart>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-export default {
-    data() {
-        return {
-            lineData: {
-                labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
-                datasets: [
-                    {
-                        label: 'First Dataset',
-                        data: [65, 59, 80, 81, 56, 55, 40],
-                        fill: false,
-                        borderColor: '#03A9F4',
-                        tension: 0.4,
-                    },
-                    {
-                        label: 'Second Dataset',
-                        data: [28, 48, 40, 19, 86, 27, 90],
-                        fill: false,
-                        borderColor: '#FFC107',
-                        tension: 0.4,
-                    },
-                ],
-            },
-            pieData: {
-                labels: ['A', 'B', 'C'],
-                datasets: [
-                    {
-                        data: [540, 325, 702, 421],
-                        backgroundColor: ['rgb(54, 162, 235)', 'rgb(255, 99, 132)', 'rgb(255, 205, 86)', 'rgb(75, 192, 192)'],
-                    },
-                ],
-            },
-            polarData: {
-                datasets: [
-                    {
-                        data: [11, 16, 7, 3],
-                        backgroundColor: ['rgb(54, 162, 235)', 'rgb(255, 99, 132)', 'rgb(255, 205, 86)', 'rgb(75, 192, 192)'],
-                        label: 'My dataset',
-                    },
-                ],
-                labels: ['Blue', 'Purple', 'Orange', 'Green'],
-            },
-            barData: {
-                labels: ['January', 'February', 'March', 'April', 'May', 'June', 'July'],
-                datasets: [
-                    {
-                        label: 'My First dataset',
-                        backgroundColor: 'rgb(255, 99, 132)',
-                        borderColor: 'rgb(255, 99, 132)',
-                        data: [65, 59, 80, 81, 56, 55, 40],
-                    },
-                    {
-                        label: 'My Second dataset',
-                        backgroundColor: 'rgb(54, 162, 235)',
-                        borderColor: 'rgb(54, 162, 235)',
-                        data: [28, 48, 40, 19, 86, 27, 90],
-                    },
-                ],
-            },
-            doughnutData: {
-                labels: ['A', 'B', 'C'],
-                datasets: [
-                    {
-                        data: [300, 50, 100],
-                        backgroundColor: ['#FFC107', '#03A9F4', '#4CAF50'],
-                        hoverBackgroundColor: ['#FFE082', '#81D4FA', '#A5D6A7'],
-                    },
-                ],
-            },
-            radarData: {
-                labels: ['Eating', 'Drinking', 'Sleeping', 'Designing', 'Coding', 'Cycling', 'Running'],
-                datasets: [
-                    {
-                        label: 'My First dataset',
-                        backgroundColor: 'rgba(179,181,198,0.2)',
-                        borderColor: 'rgba(179,181,198,1)',
-                        pointBackgroundColor: 'rgba(179,181,198,1)',
-                        pointBorderColor: '#fff',
-                        pointHoverBackgroundColor: '#fff',
-                        pointHoverBorderColor: 'rgba(179,181,198,1)',
-                        data: [65, 59, 90, 81, 56, 55, 40],
-                    },
-                    {
-                        label: 'My Second dataset',
-                        backgroundColor: 'rgba(255,99,132,0.2)',
-                        borderColor: 'rgba(255,99,132,1)',
-                        pointBackgroundColor: 'rgba(255,99,132,1)',
-                        pointBorderColor: '#fff',
-                        pointHoverBackgroundColor: '#fff',
-                        pointHoverBorderColor: 'rgba(255,99,132,1)',
-                        data: [28, 48, 40, 19, 96, 27, 100],
-                    },
-                ],
-            },
-        };
-    },
-};
-</script>
-
-<style scoped></style>
diff --git a/prestige-vue-4.0.0/src/views/basic/Basic3.vue b/prestige-vue-4.0.0/src/views/basic/Basic3.vue
deleted file mode 100644
index 35800b8..0000000
--- a/prestige-vue-4.0.0/src/views/basic/Basic3.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<template>
-    <div class="grid">
-        <div class="col-12">
-            <div class="card">
-                <h5>Advanced</h5>
-                <FileUpload name="demo[]" @uploader="onUpload" :multiple="true" accept="image/*" :maxFileSize="1000000" customUpload />
-
-                <h5>Basic</h5>
-                <FileUpload mode="basic" name="demo[]" accept="image/*" :maxFileSize="1000000" @uploader="onUpload" customUpload />
-            </div>
-        </div>
-        <Toast />
-    </div>
-</template>
-
-<script>
-export default {
-    methods: {
-        onUpload() {
-            this.$toast.add({ severity: 'info', summary: 'Success', detail: 'File Uploaded', life: 3000 });
-        },
-    },
-};
-</script>
-
-<style scoped></style>
diff --git a/prestige-vue-4.0.0/src/views/basic/Basic4.vue b/prestige-vue-4.0.0/src/views/basic/Basic4.vue
deleted file mode 100644
index 3eb6767..0000000
--- a/prestige-vue-4.0.0/src/views/basic/Basic4.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<template>
-    <div class="floatlabel-demo">
-        <div class="card">
-            <h5>Float Label</h5>
-            <p>All input text components support floating labels by adding (<mark>.p-float-label</mark>) to wrapper class.</p>
-            <div class="grid p-fluid">
-                <div class="col-12 md:col-6">
-                    <div class="field">
-                        <span class="p-float-label">
-                            <InputText type="text" id="inputtext" v-model="value1" />
-                            <label for="inputtext">InputText</label>
-                        </span>
-                    </div>
-                    <div class="field">
-                        <span class="p-float-label p-input-icon-left">
-                            <i class="pi pi-search" />
-                            <InputText type="text" id="lefticon" v-model="value3" />
-                            <label for="lefticon">Left Icon</label>
-                        </span>
-                    </div>
-                    <div class="field">
-                        <span class="p-float-label p-input-icon-right">
-                            <i class="pi pi-spin pi-spinner" />
-                            <InputText type="text" id="righticon" v-model="value5" />
-                            <label for="righticon">Right Icon</label>
-                        </span>
-                    </div>
-                    <div class="field">
-                        <span class="p-float-label">
-                            <InputMask id="inputmask" mask="99/99/9999" v-model="value7"></InputMask>
-                            <label for="inputmask">InputMask</label>
-                        </span>
-                    </div>
-                    <div class="field">
-                        <span class="p-float-label">
-                            <InputNumber id="inputnumber" v-model="value9"></InputNumber>
-                            <label for="inputnumber">InputNumber</label>
-                        </span>
-                    </div>
-                    <div class="field">
-                        <span class="p-float-label">
-                            <Chips inputId="chips" v-model="value11"></Chips>
-                            <label for="chips">Chips</label>
-                        </span>
-                    </div>
-                </div>
-
-                <div class="col-12 md:col-6">
-                    <div class="field">
-                        <div class="p-inputgroup">
-                            <span class="p-inputgroup-addon">
-                                <i class="pi pi-user"></i>
-                            </span>
-                            <span class="p-float-label">
-                                <InputText type="text" id="inputgroup" v-model="value2" />
-                                <label for="inputgroup">InputGroup</label>
-                            </span>
-                        </div>
-                    </div>
-                    <div class="field">
-                        <span class="p-float-label">
-                            <AutoComplete id="autocomplete" v-model="value4" :suggestions="filteredCountries" @complete="searchCountry($event)" field="name"></AutoComplete>
-                            <label for="autocomplete">AutoComplete</label>
-                        </span>
-                    </div>
-                    <div class="field">
-                        <span class="p-float-label">
-                            <Calendar inputId="calendar" v-model="value6"></Calendar>
-                            <label for="calendar">Calendar</label>
-                        </span>
-                    </div>
-                    <div class="field">
-                        <span class="p-float-label">
-                            <Dropdown id="dropdown" :options="cities" v-model="value8" optionLabel="name"></Dropdown>
-                            <label for="dropdown">Dropdown</label>
-                        </span>
-                    </div>
-                    <div class="field">
-                        <span class="p-float-label">
-                            <MultiSelect id="multiselect" :options="cities" v-model="value10" optionLabel="name" :filter="false"></MultiSelect>
-                            <label for="multiselect">MultiSelect</label>
-                        </span>
-                    </div>
-                    <div class="field">
-                        <span class="p-float-label">
-                            <Textarea inputId="textarea" rows="3" cols="30" v-model="value12"></Textarea>
-                            <label for="textarea">Textarea</label>
-                        </span>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-import CountryService from '@/service/CountryService';
-export default {
-    data() {
-        return {
-            countries: [],
-            filteredCountries: null,
-            cities: [
-                { name: 'New York', code: 'NY' },
-                { name: 'Rome', code: 'RM' },
-                { name: 'London', code: 'LDN' },
-                { name: 'Istanbul', code: 'IST' },
-                { name: 'Paris', code: 'PRS' },
-            ],
-            value1: null,
-            value2: null,
-            value3: null,
-            value4: null,
-            value5: null,
-            value6: null,
-            value7: null,
-            value8: null,
-            value9: null,
-            value10: null,
-            value11: null,
-            value12: null,
-        };
-    },
-    created() {
-        this.countryService = new CountryService();
-    },
-    mounted() {
-        this.countryService.getCountries().then((countries) => {
-            this.countries = countries;
-        });
-    },
-    methods: {
-        searchCountry(event) {
-            // in a real application, make a request to a remote url with the query and
-            // return filtered results, for demo we filter at client side
-            const filtered = [];
-            const query = event.query;
-            for (let i = 0; i < this.countries.length; i++) {
-                const country = this.countries[i];
-                if (country.name.toLowerCase().indexOf(query.toLowerCase()) == 0) {
-                    filtered.push(country);
-                }
-            }
-            this.filteredCountries = filtered;
-        },
-    },
-};
-</script>
-
-<style lang="scss" scoped>
-.floatlabel-demo {
-    .field {
-        margin-top: 2rem;
-    }
-}
-</style>
diff --git a/prestige-vue-4.0.0/src/views/basic/Basic5.vue b/prestige-vue-4.0.0/src/views/basic/Basic5.vue
deleted file mode 100644
index aa11b7d..0000000
--- a/prestige-vue-4.0.0/src/views/basic/Basic5.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-    <div class="grid">
-        <div class="col-12 md:col-6">
-            <div class="card p-fluid">
-                <h5>Vertical</h5>
-                <div class="field">
-                    <label for="name1">Name</label>
-                    <InputText id="name1" type="text" />
-                </div>
-                <div class="field">
-                    <label for="email1">Email</label>
-                    <InputText id="email1" type="text" />
-                </div>
-                <div class="field">
-                    <label for="age1">Age</label>
-                    <InputText id="age1" type="text" />
-                </div>
-            </div>
-
-            <div class="card p-fluid">
-                <h5>Vertical Grid</h5>
-                <div class="formgrid grid">
-                    <div class="field col">
-                        <label for="name2">Name</label>
-                        <InputText id="name2" type="text" />
-                    </div>
-                    <div class="field col">
-                        <label for="email2">Email</label>
-                        <InputText id="email2" type="text" />
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div class="col-12 md:col-6">
-            <div class="card p-fluid">
-                <h5>Horizontal</h5>
-                <div class="field grid">
-                    <label for="name3" class="col-12 mb-2 md:col-2 md:mb-0">Name</label>
-                    <div class="col-12 md:col-10">
-                        <InputText id="name3" type="text" />
-                    </div>
-                </div>
-                <div class="field grid">
-                    <label for="email3" class="col-12 mb-2 md:col-2 md:mb-0">Email</label>
-                    <div class="col-12 md:col-10">
-                        <InputText id="email3" type="text" />
-                    </div>
-                </div>
-            </div>
-
-            <div class="card">
-                <h5>Inline</h5>
-                <div class="formgroup-inline">
-                    <div class="field">
-                        <label for="firstname1" class="p-sr-only">Firstname</label>
-                        <InputText id="firstname1" type="text" placeholder="Firstname" />
-                    </div>
-                    <div class="field">
-                        <label for="lastname1" class="p-sr-only">Lastname</label>
-                        <InputText id="lastname1" type="text" placeholder="Lastname" />
-                    </div>
-                    <Button label="Submit"></Button>
-                </div>
-            </div>
-
-            <div class="card">
-                <h5>Help Text</h5>
-                <div class="field p-fluid">
-                    <label for="username">Username</label>
-                    <InputText id="username" type="text" />
-                    <small>Enter your username to reset your password.</small>
-                </div>
-            </div>
-        </div>
-
-        <div class="col-12">
-            <div class="card">
-                <h5>Advanced</h5>
-                <div class="p-fluid formgrid grid">
-                    <div class="field col-12 md:col-6">
-                        <label for="firstname2">Firstname</label>
-                        <InputText id="firstname2" type="text" />
-                    </div>
-                    <div class="field col-12 md:col-6">
-                        <label for="lastname2">Lastname</label>
-                        <InputText id="lastname2" type="text" />
-                    </div>
-                    <div class="field col-12">
-                        <label for="address">Address</label>
-                        <Textarea id="address" rows="4" />
-                    </div>
-                    <div class="field col-12 md:col-6">
-                        <label for="city">City</label>
-                        <InputText id="city" type="text" />
-                    </div>
-                    <div class="field col-12 md:col-3">
-                        <label for="state">State</label>
-                        <Dropdown id="state" v-model="dropdownItem" :options="dropdownItems" optionLabel="name" placeholder="Select One"></Dropdown>
-                    </div>
-                    <div class="field col-12 md:col-3">
-                        <label for="zip">Zip</label>
-                        <InputText id="zip" type="text" />
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-export default {
-    data() {
-        return {
-            dropdownItems: [
-                { name: 'Option 1', code: 'Option 1' },
-                { name: 'Option 2', code: 'Option 2' },
-                { name: 'Option 3', code: 'Option 3' },
-            ],
-            dropdownItem: null,
-        };
-    },
-};
-</script>
diff --git a/prestige-vue-4.0.0/src/views/system/Authority.vue b/prestige-vue-4.0.0/src/views/system/Authority.vue
deleted file mode 100644
index ec463fb..0000000
--- a/prestige-vue-4.0.0/src/views/system/Authority.vue
+++ /dev/null
@@ -1,126 +0,0 @@
-<template>
-    <div class="grid">
-        <div class="col-12">
-            <div class="card">
-                <h5>Calendar</h5>
-                <FullCalendar :events="events" :options="options" />
-
-                <Dialog v-model:visible="eventDialog" :style="{ width: '450px' }" header="Event Details" :modal="true" :closable="true">
-                    <div class="p-fluid">
-                        <div class="field">
-                            <label for="title">Title</label>
-                            <InputText id="title" v-if="clickedEvent" v-model="changedEvent.title" required="true" autofocus />
-                        </div>
-                        <div class="field">
-                            <label for="start">From</label>
-                            <Calendar id="start" v-if="clickedEvent" v-model="changedEvent.start" :showTime="true" appendTo="body" />
-                        </div>
-                        <div class="field">
-                            <label for="end">To</label>
-                            <Calendar id="end" v-if="clickedEvent" v-model="changedEvent.end" :showTime="true" appendTo="body" />
-                        </div>
-                        <div class="field-checkbox">
-                            <Checkbox id="allday" name="allday" value="All Day" v-model="changedEvent.allDay" />
-                            <label for="allday">All Day</label>
-                        </div>
-                    </div>
-                    <template #footer>
-                        <Button label="Save" icon="pi pi-check" class="p-button-text" @click="save" />
-                        <Button label="Reset" icon="pi pi-refresh" class="p-button-text" @click="reset" />
-                    </template>
-                </Dialog>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script>
-import '@fullcalendar/core/vdom';
-import EventService from '@/service/EventService';
-import dayGridPlugin from '@fullcalendar/daygrid';
-import timeGridPlugin from '@fullcalendar/timegrid';
-import interactionPlugin from '@fullcalendar/interaction';
-import FullCalendar from 'primevue/fullcalendar';
-export default {
-    components: {
-        FullCalendar,
-    },
-    data() {
-        return {
-            eventDialog: false,
-            clickedEvent: null,
-            changedEvent: { title: '', start: null, end: '', allDay: null },
-            options: {
-                plugins: [dayGridPlugin, timeGridPlugin, interactionPlugin],
-                initialDate: '2023-01-01',
-                headerToolbar: {
-                    left: 'prev,next',
-                    center: 'title',
-                    right: 'dayGridMonth,timeGridWeek,timeGridDay',
-                },
-                editable: true,
-                selectable: true,
-                selectMirror: true,
-                dayMaxEvents: true,
-                eventClick: (e) => {
-                    this.eventDialog = true;
-                    this.clickedEvent = e.event;
-                    this.changedEvent.title = this.clickedEvent.title;
-                    this.changedEvent.start = this.clickedEvent.start;
-                    this.changedEvent.end = this.clickedEvent.end;
-                },
-            },
-            events: null,
-        };
-    },
-    eventService: null,
-    created() {
-        this.eventService = new EventService();
-    },
-    mounted() {
-        this.eventService.getEvents().then((data) => (this.events = data));
-    },
-    methods: {
-        findIndexById(id) {
-            let index = -1;
-            for (let i = 0; i < this.events.length; i++) {
-                if (this.events[i].id === id) {
-                    index = i;
-                    break;
-                }
-            }
-            return index;
-        },
-        save() {
-            this.eventDialog = false;
-            this.clickedEvent.setProp('title', this.changedEvent.title);
-            this.clickedEvent.setStart(this.changedEvent.start);
-            this.clickedEvent.setEnd(this.changedEvent.end);
-            this.clickedEvent.setAllDay(this.changedEvent.allDay);
-            this.changedEvent = { title: '', start: null, end: '', allDay: null };
-        },
-        reset() {
-            this.changedEvent.title = this.clickedEvent.title;
-            this.changedEvent.start = this.clickedEvent.start;
-            this.changedEvent.end = this.clickedEvent.end;
-        },
-    },
-};
-</script>
-
-<style scoped>
-::v-deep(.fc .fc-col-header-cell-cushion),
-::v-deep(.fc-daygrid-dot-event .fc-event-time),
-::v-deep(.fc-daygrid-dot-event .fc-event-title),
-::v-deep(.fc .fc-daygrid-day-number),
-::v-deep(.fc .fc-daygrid-more-link) {
-    color: var(--text-color);
-}
-
-@media screen and (max-width: 960px) {
-    ::v-deep(.fc-header-toolbar) {
-        display: flex;
-        flex-wrap: wrap;
-    }
-}
-</style>
diff --git a/prestige-vue-4.0.0/src/views/system/SystemCode.vue b/prestige-vue-4.0.0/src/views/system/SystemCode.vue
index 12014ce..63c6095 100644
--- a/prestige-vue-4.0.0/src/views/system/SystemCode.vue
+++ b/prestige-vue-4.0.0/src/views/system/SystemCode.vue
@@ -1,25 +1,33 @@
 <template>
     <div class="card">
         <Toast />
-        <div class="card formgrid grid">
-            <div class="field col grid">
-                <div class="field col-12 md:col-6">
+        <div class="card formgrid grid" style="margin-bottom: 0px;">
+            <div class="field col grid" style="margin-bottom: 0px;">
+                <div class="field col-12 md:col-6" style="margin-bottom: 0px;">
                     <label for="codeType">코드유형</label>
                     <AutoComplete v-model="codeType" dropdown :suggestions="filteredItems" @complete="searchItems" class="w-full" />
                 </div>
-                <div class="field  col-12 md:col-6">
+                <div class="field  col-12 md:col-6" style="margin-bottom: 0px;">
                     <label for="useAt">사용여부</label>
                     <SelectButton v-model="useAt" :options="options" aria-labelledby="basic" class="w-full" @click="setData(data)"/>
                 </div>
             </div>
             <SplitButton label="Search" icon="pi pi-plus" @click="search" :model="buttonItems" class="bg-primary" />
         </div>  
-
+        <Toolbar style="background: #ffffff; border: 0px;">
+            <template #end>
+                <Button icon="pi pi-refresh" aria-label="Filter" @click="refreshRow()"/>
+                <span style="width: 5px;"></span>
+                <Button icon="pi pi-plus" aria-label="Filter" @click="addRow()"/>
+                <span style="width: 5px;"></span>
+                <Button icon="pi pi-minus" aria-label="Filter"  @click="delRow()"/>
+            </template>
+        </Toolbar>
         <div class="grid">
             <div class="col-12 md:col-4" style="padding: 0; padding-right: 10px;">
                 <ag-grid-vue
                     style="width: 100%; height: 350px;"
-                    class="ag-theme-quartz"
+                    class="ag-theme-balham"
                     :columnDefs="columnsType"                        
                     :rowData="codeTypeItems"
                     @grid-ready="onGridReadyType"
@@ -32,7 +40,7 @@
             <div class="col-12 md:col-8" style="padding: 0">
                 <ag-grid-vue
                     style="width: 100%; height: 350px;"
-                    class="ag-theme-quartz"
+                    class="ag-theme-balham"
                     :columnDefs="columns"                        
                     :rowData="codeItems"
                     :rowSelection="rowSelection"
@@ -56,6 +64,7 @@ import axios from '../../service/axios';
 import { onBeforeMount, ref } from 'vue';
 import { useI18n } from 'vue-i18n'
 import RendererRowStatus from "../common/RendererRowStatus.vue";
+import ags from '../../service/AgGridService';
 
 const toast = useToast();
 
@@ -103,6 +112,12 @@ const columns = [
         cellRenderer:  RendererRowStatus
     },
     {
+        headerName: i18n.t('System.SystemCode.grid.CodeType'),
+        field: "codeTy",
+        editable: true,
+        pinned: 'left',
+    },
+    {
         headerName: i18n.t('System.SystemCode.grid.Code'),
         field: "cmmnCode",
         editable: true,
@@ -181,6 +196,7 @@ const columns = [
 const rowSelection = ref(null);
 const gridApiType = ref();
 const gridApi = ref();
+let selectCodeTy = "";
 
 onBeforeMount(() => {
     rowSelection.value = 'single';
@@ -198,16 +214,14 @@ const onSelectionChanged = () => {
             }
         );
     }
+    selectCodeTy = selectedRows[0].cmmnCode;
 };
 
 const onCellValueChanged = (event) => {
-    console.log("onCellValueChanged");
-    event.data.rowStatus = "U";    
-    const res = gridApi.value.applyTransaction({
-        update: [event.data]
-    });    
+    let res = ags.agGridChangeStatusRow(gridApi, event);
     console.log(res);
 };
+
 const onGridReadyType = (params) => {
     gridApiType.value = params.api;
 
@@ -269,6 +283,7 @@ const setData = (responseData) => {
         defaultMinWidth: 50
     });
     codeItems.value = [];
+    selectCodeTy = "";
 }
 
 const buttonItems = [
@@ -323,6 +338,24 @@ const saveData = async () => {
 
 };
 
+const addRow = () => {
+    const res = ags.agGridAddRow(gridApi, 1, false);
+    console.log(res);
+}
+
+const delRow = () => {
+    const selectedNodes = gridApi.value.getSelectedNodes();  //[]
+    const res = ags.agGridDelRow(gridApi, selectedNodes);
+    console.log(res);
+}
+
+const refreshRow = () => {
+    const selectedRows = gridApi.value.getSelectedRows();
+    ags.agGridEraseStatusRow(gridApi, selectedRows);
+    console.log(res);
+}
+
+
 //--------------------------------------------------------------------------------------------
 
 </script>
diff --git a/prestige-vue-4.0.0/src/views/system/User.vue b/prestige-vue-4.0.0/src/views/system/User.vue
index 4ecd406..a9997ab 100644
--- a/prestige-vue-4.0.0/src/views/system/User.vue
+++ b/prestige-vue-4.0.0/src/views/system/User.vue
@@ -1,308 +1,265 @@
 <template>
-    <div class="grid crud-demo">
-        <div class="col-12">
-            <div class="card">
-                <Toast />
-                <Toolbar class="mb-4">
-                    <template v-slot:start>
-                        <div class="my-2">
-                            <Button label="New" icon="pi pi-plus" class="p-button-success mr-2" @click="openNew" />
-                            <Button label="Delete" icon="pi pi-trash" class="p-button-danger" @click="confirmDeleteSelected" :disabled="!selectedProducts || !selectedProducts.length" />
-                        </div>
-                    </template>
-
-                    <template v-slot:end>
-                        <FileUpload mode="basic" accept="image/*" :maxFileSize="1000000" label="Import" chooseLabel="Import" class="mr-2 inline-block" />
-                        <Button label="Export" icon="pi pi-upload" class="p-button-help" @click="exportCSV($event)" />
-                    </template>
-                </Toolbar>
-
-                <DataTable
-                    ref="dt"
-                    :value="products"
-                    v-model:selection="selectedProducts"
-                    dataKey="id"
-                    :paginator="true"
-                    :rows="10"
-                    :filters="filters"
-                    paginatorTemplate="FirstPageLink PrevPageLink PageLinks NextPageLink LastPageLink CurrentPageReport RowsPerPageDropdown"
-                    :rowsPerPageOptions="[5, 10, 25]"
-                    currentPageReportTemplate="Showing {first} to {last} of {totalRecords} products"
-                    responsiveLayout="scroll"
+    <div class="card">
+        <Toast />
+        <div class="card formgrid grid" style="margin-bottom: 0px;">
+            <div class="field col grid" style="margin-bottom: 0px;">
+                <div class="field col-12 md:col-6" style="margin-bottom: 0px;">
+                    <label for="userId">사용자Id</label>
+                    <AutoComplete v-model="userId" dropdown :suggestions="filteredItems" @complete="searchItems" class="w-full" />
+                </div>
+                <div class="field  col-12 md:col-6" style="margin-bottom: 0px;">
+                    <label for="activated">사용여부</label>
+                    <SelectButton v-model="activated" :options="options" aria-labelledby="basic" class="w-full" @click="setData(data)"/>
+                </div>
+            </div>
+            <SplitButton label="Search" icon="pi pi-plus" @click="search" :model="buttonItems" class="bg-primary" />
+        </div>  
+        <Toolbar style="background: #ffffff; border: 0px;">
+            <template #end>
+                <Button icon="pi pi-refresh" aria-label="Filter" @click="refreshRow()"/>
+                <span style="width: 5px;"></span>
+                <Button icon="pi pi-plus" aria-label="Filter" @click="addRow()"/>
+                <span style="width: 5px;"></span>
+                <Button icon="pi pi-minus" aria-label="Filter"  @click="delRow()"/>
+            </template>
+        </Toolbar>
+        <div class="grid">
+            <div class="col-12 md:col-12" style="padding: 0; padding-right: 10px;">
+                <ag-grid-vue
+                    style="width: 100%; height: 350px;"
+                    class="ag-theme-balham"
+                    :columnDefs="columns"                        
+                    :rowData="userItems"
+                    @grid-ready="onGridReady"
+                    :rowSelection="rowSelection"
+                    @cell-value-changed ="onCellValueChanged"
+                    :defaultColDef="defaultColDef"
                 >
-                    <template #header>
-                        <div class="flex flex-column md:flex-row md:justify-content-between md:align-items-center">
-                            <h5 class="m-0">Manage Products</h5>
-                            <span class="block mt-2 md:mt-0 p-input-icon-left">
-                                <i class="pi pi-search" />
-                                <InputText v-model="filters['global'].value" placeholder="Search..." />
-                            </span>
-                        </div>
-                    </template>
-
-                    <Column selectionMode="multiple" headerStyle="width: 3rem"></Column>
-                    <Column field="code" header="Code" :sortable="true" headerStyle="width:14%; min-width:10rem;">
-                        <template #body="slotProps">
-                            <span class="p-column-title">Code</span>
-                            {{ slotProps.data.code }}
-                        </template>
-                    </Column>
-                    <Column field="name" header="Name" :sortable="true" headerStyle="width:14%; min-width:10rem;">
-                        <template #body="slotProps">
-                            <span class="p-column-title">Name</span>
-                            {{ slotProps.data.name }}
-                        </template>
-                    </Column>
-                    <Column header="Image" headerStyle="width:14%; min-width:10rem;">
-                        <template #body="slotProps">
-                            <span class="p-column-title">Image</span>
-                            <img :src="'/demo/images/product/' + slotProps.data.image" :alt="slotProps.data.image" class="shadow-2" width="100" />
-                        </template>
-                    </Column>
-                    <Column field="price" header="Price" :sortable="true" headerStyle="width:14%; min-width:8rem;">
-                        <template #body="slotProps">
-                            <span class="p-column-title">Price</span>
-                            {{ formatCurrency(slotProps.data.price) }}
-                        </template>
-                    </Column>
-                    <Column field="category" header="Category" :sortable="true" headerStyle="width:14%; min-width:10rem;">
-                        <template #body="slotProps">
-                            <span class="p-column-title">Category</span>
-                            {{ formatCurrency(slotProps.data.category) }}
-                        </template>
-                    </Column>
-                    <Column field="rating" header="Reviews" :sortable="true" headerStyle="width:14%; min-width:10rem;">
-                        <template #body="slotProps">
-                            <span class="p-column-title">Rating</span>
-                            <Rating :modelValue="slotProps.data.rating" :readonly="true" :cancel="false" />
-                        </template>
-                    </Column>
-                    <Column field="inventoryStatus" header="Status" :sortable="true" headerStyle="width:14%; min-width:10rem;">
-                        <template #body="slotProps">
-                            <span class="p-column-title">Status</span>
-                            <span :class="'product-badge status-' + (slotProps.data.inventoryStatus ? slotProps.data.inventoryStatus.toLowerCase() : '')">{{ slotProps.data.inventoryStatus }}</span>
-                        </template>
-                    </Column>
-                    <Column headerStyle="width:14%; min-width:10rem;">
-                        <template #body="slotProps">
-                            <Button icon="pi pi-pencil" class="p-button-rounded p-button-success mr-2" @click="editProduct(slotProps.data)" />
-                            <Button icon="pi pi-trash" class="p-button-rounded p-button-warning" @click="confirmDeleteProduct(slotProps.data)" />
-                        </template>
-                    </Column>
-                </DataTable>
-
-                <Dialog v-model:visible="productDialog" :style="{ width: '450px' }" header="Product Details" :modal="true" class="p-fluid">
-                    <img :src="'/demo/images/product/' + product.image" :alt="product.image" v-if="product.image" width="150" class="mt-0 mx-auto mb-5 block shadow-2" />
-                    <div class="field">
-                        <label for="name">Name</label>
-                        <InputText id="name" v-model.trim="product.name" required="true" autofocus :class="{ 'p-invalid': submitted && !product.name }" />
-                        <small class="p-invalid" v-if="submitted && !product.name">Name is required.</small>
-                    </div>
-                    <div class="field">
-                        <label for="description">Description</label>
-                        <Textarea id="description" v-model="product.description" required="true" rows="3" cols="20" />
-                    </div>
-
-                    <div class="field">
-                        <label for="inventoryStatus" class="mb-3">Inventory Status</label>
-                        <Dropdown id="inventoryStatus" v-model="product.inventoryStatus" :options="statuses" optionLabel="label" placeholder="Select a Status">
-                            <template #value="slotProps">
-                                <div v-if="slotProps.value && slotProps.value.value">
-                                    <span :class="'product-badge status-' + slotProps.value.value">{{ slotProps.value.label }}</span>
-                                </div>
-                                <div v-else-if="slotProps.value && !slotProps.value.value">
-                                    <span :class="'product-badge status-' + slotProps.value.toLowerCase()">{{ slotProps.value }}</span>
-                                </div>
-                                <span v-else>
-                                    {{ slotProps.placeholder }}
-                                </span>
-                            </template>
-                        </Dropdown>
-                    </div>
-
-                    <div class="field">
-                        <label class="mb-3">Category</label>
-                        <div class="formgrid grid">
-                            <div class="field-radiobutton col-6">
-                                <RadioButton id="category1" name="category" value="Accessories" v-model="product.category" />
-                                <label for="category1">Accessories</label>
-                            </div>
-                            <div class="field-radiobutton col-6">
-                                <RadioButton id="category2" name="category" value="Clothing" v-model="product.category" />
-                                <label for="category2">Clothing</label>
-                            </div>
-                            <div class="field-radiobutton col-6">
-                                <RadioButton id="category3" name="category" value="Electronics" v-model="product.category" />
-                                <label for="category3">Electronics</label>
-                            </div>
-                            <div class="field-radiobutton col-6">
-                                <RadioButton id="category4" name="category" value="Fitness" v-model="product.category" />
-                                <label for="category4">Fitness</label>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="formgrid grid">
-                        <div class="field col">
-                            <label for="price">Price</label>
-                            <InputNumber id="price" v-model="product.price" mode="currency" currency="USD" locale="en-US" />
-                        </div>
-                        <div class="field col">
-                            <label for="quantity">Quantity</label>
-                            <InputNumber id="quantity" v-model="product.quantity" integeronly />
-                        </div>
-                    </div>
-                    <template #footer>
-                        <Button label="Cancel" icon="pi pi-times" class="p-button-text" @click="hideDialog" />
-                        <Button label="Save" icon="pi pi-check" class="p-button-text" @click="saveProduct" />
-                    </template>
-                </Dialog>
-
-                <Dialog v-model:visible="deleteProductDialog" :style="{ width: '450px' }" header="Confirm" :modal="true">
-                    <div class="flex align-items-center justify-content-center">
-                        <i class="pi pi-exclamation-triangle mr-3" style="font-size: 2rem" />
-                        <span v-if="product"
-                            >Are you sure you want to delete <b>{{ product.name }}</b
-                            >?</span
-                        >
-                    </div>
-                    <template #footer>
-                        <Button label="No" icon="pi pi-times" class="p-button-text" @click="deleteProductDialog = false" />
-                        <Button label="Yes" icon="pi pi-check" class="p-button-text" @click="deleteProduct" />
-                    </template>
-                </Dialog>
-
-                <Dialog v-model:visible="deleteProductsDialog" :style="{ width: '450px' }" header="Confirm" :modal="true">
-                    <div class="flex align-items-center justify-content-center">
-                        <i class="pi pi-exclamation-triangle mr-3" style="font-size: 2rem" />
-                        <span v-if="product">Are you sure you want to delete the selected products?</span>
-                    </div>
-                    <template #footer>
-                        <Button label="No" icon="pi pi-times" class="p-button-text" @click="deleteProductsDialog = false" />
-                        <Button label="Yes" icon="pi pi-check" class="p-button-text" @click="deleteSelectedProducts" />
-                    </template>
-                </Dialog>
+                </ag-grid-vue>
             </div>
+
         </div>
     </div>
 </template>
 
-<script>
-import { FilterMatchMode } from 'primevue/api';
-import ProductService from '@/service/ProductService';
-
-export default {
-    data() {
-        return {
-            products: null,
-            productDialog: false,
-            deleteProductDialog: false,
-            deleteProductsDialog: false,
-            product: {},
-            selectedProducts: null,
-            filters: {},
-            submitted: false,
-            statuses: [
-                { label: 'INSTOCK', value: 'instock' },
-                { label: 'LOWSTOCK', value: 'lowstock' },
-                { label: 'OUTOFSTOCK', value: 'outofstock' },
-            ],
-        };
+<script setup>
+//--------------------------------------------------------------------------------------------
+// imprort
+//--------------------------------------------------------------------------------------------
+import { useToast } from "primevue/usetoast";
+import axios from '../../service/axios';
+import { onBeforeMount, ref } from 'vue';
+import { useI18n } from 'vue-i18n'
+import RendererRowStatus from "../common/RendererRowStatus.vue";
+import ags from '../../service/AgGridService';
+
+const toast = useToast();
+
+//--------------------------------------------------------------------------------------------
+// 변수선언
+//--------------------------------------------------------------------------------------------
+const userItems = ref("");
+const filteredItems = ref();
+const userId = ref("");
+const activated = ref("전체");
+const options = ref(['전체', '사용', '미사용']);
+
+let data = [];
+
+const i18n = useI18n()
+//--------------------------------------------------------------------------------------------
+
+//--------------------------------------------------------------------------------------------
+// ag-grid Header
+//--------------------------------------------------------------------------------------------
+
+const defaultColDef = {
+    filter: true,
+    enableCellChangeFlash: true,
+};
+
+const columns = [
+    {
+        headerName: "",
+        field: "rowStatus",
+        editable: false,
+        pinned: 'left',
+        maxWidth: 45,
+        cellRenderer:  RendererRowStatus
+    },
+    {
+        headerName: "사용자ID",
+        field: "userId",
+        editable: false,
     },
-    productService: null,
-    created() {
-        this.productService = new ProductService();
-        this.initFilters();
+    {
+        headerName: "사용여부",
+        field: "activated",
+        maxWidth: 100,
+        editable: true,
     },
-    mounted() {
-        this.productService.getProducts().then((data) => (this.products = data));
+    {
+        headerName: "사용자명",
+        field: "username",
+        editable: true,
     },
-    methods: {
-        formatCurrency(value) {
-            if (value) return value.toLocaleString('en-US', { style: 'currency', currency: 'USD' });
-            return;
-        },
-        openNew() {
-            this.product = {};
-            this.submitted = false;
-            this.productDialog = true;
-        },
-        hideDialog() {
-            this.productDialog = false;
-            this.submitted = false;
-        },
-        saveProduct() {
-            this.submitted = true;
-            if (this.product.name.trim()) {
-                if (this.product.id) {
-                    this.product.inventoryStatus = this.product.inventoryStatus.value ? this.product.inventoryStatus.value : this.product.inventoryStatus;
-                    this.products[this.findIndexById(this.product.id)] = this.product;
-                    this.$toast.add({ severity: 'success', summary: 'Successful', detail: 'Product Updated', life: 3000 });
-                } else {
-                    this.product.id = this.createId();
-                    this.product.code = this.createId();
-                    this.product.image = 'product-placeholder.svg';
-                    this.product.inventoryStatus = this.product.inventoryStatus ? this.product.inventoryStatus.value : 'INSTOCK';
-                    this.products.push(this.product);
-                    this.$toast.add({ severity: 'success', summary: 'Successful', detail: 'Product Created', life: 3000 });
-                }
-                this.productDialog = false;
-                this.product = {};
-            }
-        },
-        editProduct(product) {
-            this.product = { ...product };
-            this.productDialog = true;
-        },
-        confirmDeleteProduct(product) {
-            this.product = product;
-            this.deleteProductDialog = true;
-        },
-        deleteProduct() {
-            this.products = this.products.filter((val) => val.id !== this.product.id);
-            this.deleteProductDialog = false;
-            this.product = {};
-            this.$toast.add({ severity: 'success', summary: 'Successful', detail: 'Product Deleted', life: 3000 });
-        },
-        findIndexById(id) {
-            let index = -1;
-            for (let i = 0; i < this.products.length; i++) {
-                if (this.products[i].id === id) {
-                    index = i;
-                    break;
-                }
-            }
-            return index;
-        },
-        createId() {
-            let id = '';
-            var chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-            for (var i = 0; i < 5; i++) {
-                id += chars.charAt(Math.floor(Math.random() * chars.length));
-            }
-            return id;
-        },
-        exportCSV() {
-            this.$refs.dt.exportCSV();
-        },
-        confirmDeleteSelected() {
-            this.deleteProductsDialog = true;
-        },
-        deleteSelectedProducts() {
-            this.products = this.products.filter((val) => !this.selectedProducts.includes(val));
-            this.deleteProductsDialog = false;
-            this.selectedProducts = null;
-            this.$toast.add({ severity: 'success', summary: 'Successful', detail: 'Products Deleted', life: 3000 });
-        },
-        initFilters() {
-            this.filters = {
-                global: { value: null, matchMode: FilterMatchMode.CONTAINS },
-            };
-        },
+    {
+        headerName: "패스워드",
+        field: "password",
+        editable: true,
     },
+    {
+        headerName: "별명",
+        field: "nickname",
+        editable: true,
+    }
+];
+//--------------------------------------------------------------------------------------------
+
+
+
+//--------------------------------------------------------------------------------------------
+//ag-grid function
+//--------------------------------------------------------------------------------------------
+const rowSelection = ref(null);
+const gridApi = ref();
+
+onBeforeMount(() => {
+    rowSelection.value = 'single';
+});
+
+const onCellValueChanged = (event) => {
+    let res = ags.agGridChangeStatusRow(gridApi, event);
+    console.log(res);
 };
-</script>
 
-<style scoped lang="scss">
-@import '@/assets/demo/styles/badges.scss';
-</style>
+const onGridReady = (params) => {
+    gridApi.value = params.api;
+
+    getData();
+};
+
+const searchItems = (event) => {
+    let query = event.query;
+    let _filteredItems = [];
+
+    for (let i = 0; i < userItems.value.length; i++) {
+        let item = userItems.value[i];
+
+        if (item.username.toLowerCase().indexOf(query.toLowerCase()) >= 0) {
+            _filteredItems.push(item.userId + " : " + item.username );
+        }
+    }
+
+    filteredItems.value = _filteredItems;
+};
+//--------------------------------------------------------------------------------------------
+
+//--------------------------------------------------------------------------------------------
+// 일반 Function
+//--------------------------------------------------------------------------------------------
+const getData = async () => {   
+
+    try{    
+        const response = await axios.post('/api/user/users', {});
+        console.log('response => ');
+        console.log(response);
+
+        console.log('response.status = ' + response.status);
+        if (response.status == 200) {
+            console.log('Search Datas: ' + JSON.stringify(response.data));
+
+            setData(response.data);
+
+            toast.add({ severity: 'success', summary: 'Success', detail: 'Search successfully', life: 3000 });
+        }
+        return response.status;
+    }catch(err){        
+        toast.add({ severity: 'error', summary: 'Error', detail: err.message, life: 3000 });
+        return err.message;
+    }
+
+};
+
+const setData = (responseData) => {
+    data = responseData; //조회데이타
+    //코드타입 데이타만 업데이트
+    let sActivated = activated.value==="전체"?"true,false":activated.value==="사용"?"true":"false";
+    userItems.value = data.filter(rec => sActivated.indexOf(rec.activated) > -1).sort((a, b) => a.userId - b.userId) ;
+    gridApi.value.sizeColumnsToFit({
+        defaultMinWidth: 50
+    });
+}
+
+const buttonItems = [
+{
+    label: 'Save',
+    icon: 'pi pi-save',
+    command: () => {
+        saveData();
+    }
+},
+{
+    label: 'Download',
+    icon: 'pi pi-file-excel',
+    command: () => {
+        window.location.href = 'https://vuejs.org/';
+    }
+}
+];
+
+const search = () => {
+    getData();
+};
+
+const saveData = async () => {   
+
+    try{    
+        //rowStatus가 N,U,D인 것만 필터링
+        let updatedData = ags.agGridGetData(gridApi, true);
+        const saveParams = {
+            //여기에 업데이트된 데이타 보내기
+            searchCond: {},
+            saveData: updatedData
+        };
+        const response = await axios.post('/api/user/saveUsers', saveParams);
+        console.log('response => ');
+        console.log(response);
+
+        console.log('response.status = ' + response.status);
+        if (response.status == 200) {
+            console.log('Search Datas: ' + JSON.stringify(response.data));
+
+            setData(response.data);
+
+            toast.add({ severity: 'success', summary: 'Success', detail: 'Save successfully', life: 3000 });
+        }
+        return response.status;
+    }catch(err){        
+        toast.add({ severity: 'error', summary: 'Error', detail: err.message, life: 3000 });
+        return err.message;
+    }
+
+};
+
+const addRow = () => {
+    const res = ags.agGridAddRow(gridApi, 1, false);
+    console.log(res);
+}
+
+const delRow = () => {
+    const selectedNodes = gridApi.value.getSelectedNodes();  //[]
+    const res = ags.agGridDelRow(gridApi, selectedNodes);
+    console.log(res);
+}
+
+const refreshRow = () => {
+    const selectedRows = gridApi.value.getSelectedRows();
+    ags.agGridEraseStatusRow(gridApi, selectedRows);
+    console.log(res);
+}
+
+
+//--------------------------------------------------------------------------------------------
+
+</script>
diff --git a/prestige-vue-4.0.0/src/views/system/UserAuthority.vue b/prestige-vue-4.0.0/src/views/system/UserAuthority.vue
new file mode 100644
index 0000000..1a524b1
--- /dev/null
+++ b/prestige-vue-4.0.0/src/views/system/UserAuthority.vue
@@ -0,0 +1,267 @@
+<template>
+    <div class="card">
+        <Toast />
+        <div class="card formgrid grid" style="margin-bottom: 0px;">
+            <div class="field col grid" style="margin-bottom: 0px;">
+                <div class="field col-12 md:col-6" style="margin-bottom: 0px;">
+                    <label for="username">사용자명</label>
+                    <AutoComplete v-model="username" dropdown :suggestions="filteredItems" @complete="searchItems" class="w-full" />
+                </div>
+            </div>
+            <SplitButton label="Search" icon="pi pi-plus" @click="search" :model="buttonItems" class="bg-primary" />
+        </div>  
+        <Toolbar style="background: #ffffff; border: 0px;">
+            <template #end>
+                <Button icon="pi pi-refresh" aria-label="Filter" @click="refreshRow()"/>
+                <span style="width: 5px;"></span>
+                <Button icon="pi pi-plus" aria-label="Filter" @click="addRow()"/>
+                <span style="width: 5px;"></span>
+                <Button icon="pi pi-minus" aria-label="Filter"  @click="delRow()"/>
+            </template>
+        </Toolbar>
+        <div class="grid">
+            <div class="col-12 md:col-12" style="padding: 0; padding-right: 10px;">
+                <ag-grid-vue
+                    style="width: 100%; height: 350px;"
+                    class="ag-theme-balham"
+                    :columnDefs="columns"                        
+                    :rowData="userAuthorityItems"
+                    @grid-ready="onGridReady"
+                    :rowSelection="rowSelection"
+                    @cell-value-changed ="onCellValueChanged"
+                    :defaultColDef="defaultColDef"
+                >
+                </ag-grid-vue>
+            </div>
+
+        </div>
+    </div>
+</template>
+
+<script setup>
+//--------------------------------------------------------------------------------------------
+// imprort
+//--------------------------------------------------------------------------------------------
+import { useToast } from "primevue/usetoast";
+import axios from '../../service/axios';
+import { onBeforeMount, ref } from 'vue';
+import { useI18n } from 'vue-i18n'
+import RendererRowStatus from "../common/RendererRowStatus.vue";
+import ags from '../../service/AgGridService';
+
+const toast = useToast();
+
+//--------------------------------------------------------------------------------------------
+// 변수선언
+//--------------------------------------------------------------------------------------------
+const userAuthorityItems = ref("");
+const filteredItems = ref();
+const username = ref("");
+
+let data = [];
+
+const i18n = useI18n()
+//--------------------------------------------------------------------------------------------
+
+//--------------------------------------------------------------------------------------------
+// ag-grid Header
+//--------------------------------------------------------------------------------------------
+
+const defaultColDef = {
+    filter: true,
+    enableCellChangeFlash: true,
+};
+
+const userNames = ref([]);
+const authorities = ref([]);
+
+const columns = [
+    {
+        headerName: "",
+        field: "rowStatus",
+        editable: false,
+        pinned: 'left',
+        maxWidth: 45,
+        cellRenderer:  RendererRowStatus
+    },
+    {
+        headerName: "사용자ID",
+        field: "userId",
+        editable: false,
+        maxWidth: 150,
+    },
+    {
+        headerName: "사용자명",
+        field: "username",
+        editable: true,
+        cellEditor: "agSelectCellEditor",
+        cellEditorParams: { values: userNames.value },
+    },
+    {
+        headerName: "권한명",
+        field: "authorityName",
+        editable: true,
+        cellEditor: "agSelectCellEditor",
+        cellEditorParams: { values: authorities.value },
+    }
+];
+//--------------------------------------------------------------------------------------------
+
+
+
+//--------------------------------------------------------------------------------------------
+//ag-grid function
+//--------------------------------------------------------------------------------------------
+const rowSelection = ref(null);
+const gridApi = ref();
+
+onBeforeMount(() => {
+    rowSelection.value = 'single';
+});
+
+const onCellValueChanged = (event) => {
+    let res = ags.agGridChangeStatusRow(gridApi, event);
+    console.log(res);
+};
+
+const onGridReady = (params) => {
+    gridApi.value = params.api;
+
+    getData();
+};
+
+const searchItems = (event) => {
+    let query = event.query;
+    let _filteredItems = [];
+
+    for (let i = 0; i < userAuthorityItems.value.length; i++) {
+        let item = userAuthorityItems.value[i];
+
+        if (item.username.toLowerCase().indexOf(query.toLowerCase()) >= 0) {
+            _filteredItems.push(item.username);
+        }
+    }
+
+    filteredItems.value = _filteredItems;
+};
+//--------------------------------------------------------------------------------------------
+
+//--------------------------------------------------------------------------------------------
+// 일반 Function
+//--------------------------------------------------------------------------------------------
+const getData = async () => {   
+
+    try{    
+        const response = await axios.post('/api/user/usersAuthority', {
+            username: username.value
+        });
+        console.log('response => ');
+        console.log(response);
+
+        console.log('response.status = ' + response.status);
+        if (response.status == 200) {
+            console.log('Search Datas: ' + JSON.stringify(response.data));
+
+            setData(response.data);
+
+            toast.add({ severity: 'success', summary: 'Success', detail: 'Search successfully', life: 3000 });
+        }
+        return response.status;
+    }catch(err){        
+        toast.add({ severity: 'error', summary: 'Error', detail: err.message, life: 3000 });
+        return err.message;
+    }
+
+};
+
+const setData = (responseData) => {
+    data = responseData; //조회데이타(userAuthority, userList, authorityList)
+
+    //리스트에 새로운 배열을 셋팅해서 넣으면 컬럼의 값과 연결이 되지 않기 때문에 기존의 배열을 조작해서 넣어야 연결이 된다.
+    userNames.value.splice(0);
+    data.userList.map(rec => userNames.value.push(rec.username));
+    authorities.value.splice(0);
+    data.authorityList.map(rec => authorities.value.push(rec.authority_name));
+
+    //데이타 셋팅
+    userAuthorityItems.value = data.userAuthority.sort((a, b) => a.userId - b.userId) ;
+
+    gridApi.value.sizeColumnsToFit({
+        defaultMinWidth: 50
+    });
+
+
+}
+
+const buttonItems = [
+{
+    label: 'Save',
+    icon: 'pi pi-save',
+    command: () => {
+        saveData();
+    }
+},
+{
+    label: 'Download',
+    icon: 'pi pi-file-excel',
+    command: () => {
+        window.location.href = 'https://vuejs.org/';
+    }
+}
+];
+
+const search = () => {
+    getData();
+};
+
+const saveData = async () => {   
+
+    try{    
+        //rowStatus가 N,U,D인 것만 필터링
+        let updatedData = ags.agGridGetData(gridApi, true);
+        const saveParams = {
+            //여기에 업데이트된 데이타 보내기
+            searchCond: {"username": username},
+            saveData: updatedData
+        };
+        const response = await axios.post('/api/user/saveUsersAuthority', saveParams);
+        console.log('response => ');
+        console.log(response);
+
+        console.log('response.status = ' + response.status);
+        if (response.status == 200) {
+            console.log('Search Datas: ' + JSON.stringify(response.data));
+
+            setData(response.data);
+
+            toast.add({ severity: 'success', summary: 'Success', detail: 'Save successfully', life: 3000 });
+        }
+        return response.status;
+    }catch(err){        
+        toast.add({ severity: 'error', summary: 'Error', detail: err.message, life: 3000 });
+        return err.message;
+    }
+
+};
+
+const addRow = () => {
+    const res = ags.agGridAddRow(gridApi, 1, false);
+    console.log(res);
+}
+
+const delRow = () => {
+    const selectedNodes = gridApi.value.getSelectedNodes();  //[]
+    const res = ags.agGridDelRow(gridApi, selectedNodes);
+    console.log(res);
+}
+
+const refreshRow = () => {
+    const selectedRows = gridApi.value.getSelectedRows();
+    ags.agGridEraseStatusRow(gridApi, selectedRows);
+    console.log(res);
+}
+
+
+//--------------------------------------------------------------------------------------------
+
+</script>
diff --git a/src/main/java/daeucna/config/security/JwtSecurityConfig.java b/src/main/java/daeucna/config/security/JwtSecurityConfig.java
index 182bed1..984c4eb 100644
--- a/src/main/java/daeucna/config/security/JwtSecurityConfig.java
+++ b/src/main/java/daeucna/config/security/JwtSecurityConfig.java
@@ -12,7 +12,7 @@ import lombok.RequiredArgsConstructor;
 @RequiredArgsConstructor
 public class JwtSecurityConfig extends SecurityConfigurerAdapter<DefaultSecurityFilterChain, HttpSecurity> {
     private final JwtTokenProvider tokenProvider;
-
+    
     @Override
     public void configure(HttpSecurity http) {
 
diff --git a/src/main/java/daeucna/config/security/SecurityConfig.java b/src/main/java/daeucna/config/security/SecurityConfig.java
index a413d72..d727b1e 100644
--- a/src/main/java/daeucna/config/security/SecurityConfig.java
+++ b/src/main/java/daeucna/config/security/SecurityConfig.java
@@ -10,8 +10,11 @@ import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 
+import daeucna.config.security.jwt.JwtAccessDeniedHandler;
 import daeucna.config.security.jwt.JwtAuthenticationEntryPoint;
+import daeucna.config.security.jwt.JwtFilter;
 import daeucna.config.security.jwt.JwtTokenProvider;
 import lombok.RequiredArgsConstructor;
 
@@ -22,6 +25,7 @@ public class SecurityConfig {
 
     private final JwtTokenProvider tokenProvider;
     private final JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint;
+    private final JwtAccessDeniedHandler jwtAccessDeniedHandler;
 
     // PasswordEncoder는 BCryptPasswordEncoder를 사용
     @Bean
@@ -45,6 +49,11 @@ public class SecurityConfig {
 //		                .anyRequest().permitAll()
 		                .anyRequest().authenticated() // 그 외 인증 없이 접근X
 	 			)
+		        .exceptionHandling(exceptionHandling -> exceptionHandling
+		        		.authenticationEntryPoint(jwtAuthenticationEntryPoint)
+	 					.accessDeniedPage("/api/exceptionDenied")
+	 					.accessDeniedHandler(jwtAccessDeniedHandler)
+				)
 	 			.formLogin(Customizer.withDefaults())
 		        .headers((headers) ->
 					headers
@@ -52,16 +61,13 @@ public class SecurityConfig {
 			                     .sameOrigin()
 			            )
 				)
-		        .exceptionHandling(exceptionHandling -> exceptionHandling
-		        		.authenticationEntryPoint(jwtAuthenticationEntryPoint)
-	 					.accessDeniedPage("/api/exceptionDenied")
-				)
                 // 세션을 사용하지 않기 때문에 STATELESS로 설정
 		        .sessionManagement((sessionManagement) ->
 					sessionManagement
 		                .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
 		        )
-                .apply(new JwtSecurityConfig(tokenProvider)); // JwtFilter를 addFilterBefore로 등록했던 JwtSecurityConfig class 적용
+		        .addFilterBefore(new JwtFilter(tokenProvider), UsernamePasswordAuthenticationFilter.class);
+//                .apply(new JwtSecurityConfig(tokenProvider)); // JwtFilter를 addFilterBefore로 등록했던 JwtSecurityConfig class 적용
 
         return httpSecurity.build();
     }
diff --git a/src/main/java/daeucna/config/security/controller/ExceptionController.java b/src/main/java/daeucna/config/security/controller/ExceptionController.java
index dfbbc92..cbfd55c 100644
--- a/src/main/java/daeucna/config/security/controller/ExceptionController.java
+++ b/src/main/java/daeucna/config/security/controller/ExceptionController.java
@@ -16,7 +16,7 @@ public class ExceptionController {
     @Operation(summary = "인가 거부", description = "인가에 따른 예외가 발생했습니다.")
     @RequestMapping(value = "/exceptionDenied", method = {RequestMethod.GET, RequestMethod.POST})
     public void AccessDeniedException() {
-        throw new AccessDeniedException("");
+        throw new AccessDeniedException("인가거부");
     }
         
 }
diff --git a/src/main/java/daeucna/config/security/controller/UserController.java b/src/main/java/daeucna/config/security/controller/UserController.java
index 96e8902..200d546 100644
--- a/src/main/java/daeucna/config/security/controller/UserController.java
+++ b/src/main/java/daeucna/config/security/controller/UserController.java
@@ -18,7 +18,7 @@ import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 
-@RestController
+@RestController(value = "SecurityUserController")
 @RequiredArgsConstructor
 @RequestMapping("/api")
 public class UserController {
diff --git a/src/main/java/daeucna/config/security/jwt/JwtAccessDeniedHandler.java b/src/main/java/daeucna/config/security/jwt/JwtAccessDeniedHandler.java
new file mode 100644
index 0000000..af32fc3
--- /dev/null
+++ b/src/main/java/daeucna/config/security/jwt/JwtAccessDeniedHandler.java
@@ -0,0 +1,20 @@
+package daeucna.config.security.jwt;
+
+import java.io.IOException;
+
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.web.access.AccessDeniedHandler;
+import org.springframework.stereotype.Component;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+@Component
+public class JwtAccessDeniedHandler implements AccessDeniedHandler {
+
+   @Override
+   public void handle(HttpServletRequest request, HttpServletResponse response, AccessDeniedException accessDeniedException) throws IOException {
+      //필요한 권한이 없이 접근하려 할때 403
+      response.sendError(HttpServletResponse.SC_FORBIDDEN);
+   }
+}
diff --git a/src/main/java/daeucna/config/security/jwt/JwtTokenProvider.java b/src/main/java/daeucna/config/security/jwt/JwtTokenProvider.java
index d788f18..f587f86 100644
--- a/src/main/java/daeucna/config/security/jwt/JwtTokenProvider.java
+++ b/src/main/java/daeucna/config/security/jwt/JwtTokenProvider.java
@@ -89,11 +89,16 @@ public class JwtTokenProvider implements InitializingBean {
                 .parseSignedClaims(token)
                 .getPayload();
 
-        Collection<? extends GrantedAuthority> authorities =
-                Arrays.stream(claims.get(AUTHORITIES_KEY).toString().split(","))
-                        .map(SimpleGrantedAuthority::new)
-                        .collect(Collectors.toList());
+//        Collection<? extends GrantedAuthority> authorities =
+//                Arrays.stream(claims.get(AUTHORITIES_KEY).toString().split(","))
+//                        .map(SimpleGrantedAuthority::new)
+//                        .collect(Collectors.toList());
 
+        Collection<? extends GrantedAuthority> authorities = 
+        	Arrays.stream(claims.get(AUTHORITIES_KEY).toString().split(","))
+        	    .map(role -> new SimpleGrantedAuthority(role))
+        	    .collect(Collectors.toList());        
+        
         User principal = new User(claims.getSubject(), "", authorities);
 
         return new UsernamePasswordAuthenticationToken(principal, token, authorities);
diff --git a/src/main/java/daeucna/mapper/primary/system/UserMapper.java b/src/main/java/daeucna/mapper/primary/system/UserMapper.java
new file mode 100644
index 0000000..c9cb41d
--- /dev/null
+++ b/src/main/java/daeucna/mapper/primary/system/UserMapper.java
@@ -0,0 +1,24 @@
+package daeucna.mapper.primary.system;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import daeucna.system.user.UserAuthorityDto;
+import daeucna.system.user.UserDto;
+
+@Mapper
+public interface UserMapper {
+   List<UserDto> getUsers(UserDto param);
+   int saveUser(UserDto param);   
+   void deleteUser(UserDto param);
+   
+   List<UserAuthorityDto> getUsersAuthority(UserAuthorityDto param);
+   int saveUserAuthority(UserAuthorityDto param);   
+   void deleteUserAuthority(UserAuthorityDto param);
+
+   List<Map> getUserList(Map param);
+   List<Map> getAuthorityList(Map param);
+   
+}
\ No newline at end of file
diff --git a/src/main/java/daeucna/system/code/CodeServiceImpl.java b/src/main/java/daeucna/system/code/CodeServiceImpl.java
index c196276..5eec1a7 100644
--- a/src/main/java/daeucna/system/code/CodeServiceImpl.java
+++ b/src/main/java/daeucna/system/code/CodeServiceImpl.java
@@ -42,7 +42,7 @@ public class CodeServiceImpl implements CodeService {
     	//삭제처리먼저
     	for (CodeDto curRec : params.getSaveData()) {
     		String sRowStatus = curRec.getRowStatus();
-    		if ("D".indexOf(sRowStatus) > 0) {
+    		if ("D".indexOf(sRowStatus) > -1) {
     			//코드
     			codeMapper.deleteCmmnCode(curRec);
     			//코드Nls
@@ -52,7 +52,7 @@ public class CodeServiceImpl implements CodeService {
     	//신규및 업데이트 처리
     	for (CodeDto curRec : params.getSaveData()) {
     		String sRowStatus = curRec.getRowStatus();
-    		if ("N,U".indexOf(sRowStatus) > 0) {
+    		if ("N,U".indexOf(sRowStatus) > -1) {
     			//코드
     			codeMapper.saveCmmnCode(curRec);
     			//코드Nls
diff --git a/src/main/java/daeucna/system/user/UserAuthorityDto.java b/src/main/java/daeucna/system/user/UserAuthorityDto.java
new file mode 100644
index 0000000..2c50470
--- /dev/null
+++ b/src/main/java/daeucna/system/user/UserAuthorityDto.java
@@ -0,0 +1,12 @@
+package daeucna.system.user;
+
+import lombok.Data;
+
+@Data
+public class UserAuthorityDto {	
+	private String rowStatus;
+
+    private Long userId;
+    private String username;
+    private String authorityName;
+}
diff --git a/src/main/java/daeucna/system/user/UserAuthoritySaveDto.java b/src/main/java/daeucna/system/user/UserAuthoritySaveDto.java
new file mode 100644
index 0000000..30a0da3
--- /dev/null
+++ b/src/main/java/daeucna/system/user/UserAuthoritySaveDto.java
@@ -0,0 +1,11 @@
+package daeucna.system.user;
+
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class UserAuthoritySaveDto {	
+	private UserAuthorityDto searchCond;
+	private List<UserAuthorityDto> saveData;
+}
diff --git a/src/main/java/daeucna/system/user/UserController.java b/src/main/java/daeucna/system/user/UserController.java
new file mode 100644
index 0000000..6d4939d
--- /dev/null
+++ b/src/main/java/daeucna/system/user/UserController.java
@@ -0,0 +1,64 @@
+package daeucna.system.user;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/user")
+public class UserController {
+	@Autowired
+    private final UserService userService;
+
+    @PostMapping("/users")
+    public ResponseEntity<List<UserDto>> getUsers(@RequestBody UserDto param) {
+    	List<UserDto> rtnVal = new ArrayList<UserDto>();
+    	
+    	rtnVal = userService.getUsers(param);
+    	
+        return ResponseEntity.ok(rtnVal);
+    }
+
+    @PostMapping("/saveUsers")
+    public ResponseEntity<List<UserDto>> saveUsers(@RequestBody UserSaveDto params) {
+    	
+    	List<UserDto> rtnVal = new ArrayList<UserDto>();
+    	
+    	rtnVal = userService.saveUsers(params);
+    	
+        return ResponseEntity.ok(rtnVal);
+    }
+
+    
+
+    @PostMapping("/usersAuthority")
+    public ResponseEntity<Map<String, Object>> usersAuthority(@RequestBody UserAuthorityDto param) {
+    	Map<String, Object> rtnVal = new HashMap<String, Object>();
+    	
+    	rtnVal = userService.getUsersAuthority(param);
+    	
+        return ResponseEntity.ok(rtnVal);
+    }
+
+    @PostMapping("/saveUsersAuthority")
+    public ResponseEntity<Map<String, Object>> saveUsersAuthority(@RequestBody UserAuthoritySaveDto params) {
+    	
+    	Map<String, Object> rtnVal = new HashMap<String, Object>();
+    	
+    	rtnVal = userService.saveUsersAuthority(params);
+    	
+        return ResponseEntity.ok(rtnVal);
+    }
+    
+}
\ No newline at end of file
diff --git a/src/main/java/daeucna/system/user/UserDto.java b/src/main/java/daeucna/system/user/UserDto.java
new file mode 100644
index 0000000..e728a31
--- /dev/null
+++ b/src/main/java/daeucna/system/user/UserDto.java
@@ -0,0 +1,14 @@
+package daeucna.system.user;
+
+import lombok.Data;
+
+@Data
+public class UserDto {	
+	private String rowStatus;
+
+    private Long userId;
+    private String username;
+    private boolean activated;
+    private String nickname;
+    private String password;
+}
diff --git a/src/main/java/daeucna/system/user/UserSaveDto.java b/src/main/java/daeucna/system/user/UserSaveDto.java
new file mode 100644
index 0000000..c6bfe39
--- /dev/null
+++ b/src/main/java/daeucna/system/user/UserSaveDto.java
@@ -0,0 +1,11 @@
+package daeucna.system.user;
+
+import java.util.List;
+
+import lombok.Data;
+
+@Data
+public class UserSaveDto {	
+	private UserDto searchCond;
+	private List<UserDto> saveData;
+}
diff --git a/src/main/java/daeucna/system/user/UserService.java b/src/main/java/daeucna/system/user/UserService.java
new file mode 100644
index 0000000..0d62296
--- /dev/null
+++ b/src/main/java/daeucna/system/user/UserService.java
@@ -0,0 +1,21 @@
+package daeucna.system.user;
+
+import java.util.List;
+import java.util.Map;
+
+public interface UserService {
+	
+	@SuppressWarnings("rawtypes")	
+    public List<UserDto> getUsers(UserDto param);
+
+	@SuppressWarnings("rawtypes")	
+    public List<UserDto> saveUsers(UserSaveDto params);
+
+	
+	@SuppressWarnings("rawtypes")	
+    public Map<String, Object> getUsersAuthority(UserAuthorityDto param);
+
+	@SuppressWarnings("rawtypes")	
+    public Map<String, Object> saveUsersAuthority(UserAuthoritySaveDto params);
+	
+}
\ No newline at end of file
diff --git a/src/main/java/daeucna/system/user/UserServiceImpl.java b/src/main/java/daeucna/system/user/UserServiceImpl.java
new file mode 100644
index 0000000..22cd4f6
--- /dev/null
+++ b/src/main/java/daeucna/system/user/UserServiceImpl.java
@@ -0,0 +1,115 @@
+package daeucna.system.user;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.password.PasswordEncoder;
+import org.springframework.stereotype.Repository;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import daeucna.mapper.primary.system.UserMapper;
+import daeucna.utils.StringUtil;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+@Repository
+@Transactional(propagation = Propagation.REQUIRED, rollbackFor = { Exception.class })
+public class UserServiceImpl implements UserService {
+	@Autowired
+	private UserMapper userMapper;
+	private final PasswordEncoder passwordEncoder;
+
+	@Override
+	public List<UserDto> getUsers(UserDto param) {
+		List<UserDto> lUserDto = new ArrayList<UserDto>();
+
+		lUserDto = userMapper.getUsers(param);
+
+		log.info("getUsers");
+		return lUserDto;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public List<UserDto> saveUsers(UserSaveDto params) {
+
+		// 삭제처리먼저
+		for (UserDto curRec : params.getSaveData()) {
+			String sRowStatus = curRec.getRowStatus();
+			if ("D".indexOf(sRowStatus) > -1) {
+				// 사용자
+				userMapper.deleteUser(curRec);
+			}
+		}
+		// 신규및 업데이트 처리
+		for (UserDto curRec : params.getSaveData()) {
+			String sRowStatus = curRec.getRowStatus();
+			if ("N,U".indexOf(sRowStatus) > -1) {
+				// 사용자
+				// 패스워드를 암호화
+				String sEncodedPassword = null;
+				String sOrgPassword = StringUtil.defaultIfEmpty(curRec.getPassword(), null);
+				if (sOrgPassword != null) sEncodedPassword = passwordEncoder.encode(sOrgPassword);
+				curRec.setPassword(sEncodedPassword);
+				userMapper.saveUser(curRec);
+			}
+		}
+
+		List<UserDto> lUserDto = userMapper.getUsers(params.getSearchCond());
+
+		log.info("saveUsers");
+		return lUserDto;
+	}
+
+	@Override
+	public Map<String, Object> getUsersAuthority(UserAuthorityDto param) {
+		Map<String, Object> rtnVal = new HashMap<String, Object>();
+
+		List<UserAuthorityDto> lUserAuthority = userMapper.getUsersAuthority(param);
+		rtnVal.put("userAuthority", lUserAuthority);
+		
+		List<Map> lmUserList = userMapper.getUserList(new HashMap<String, String>());
+		rtnVal.put("userList", lmUserList);
+
+		List<Map> lmAuthorityList = userMapper.getAuthorityList(new HashMap<String, String>());
+		rtnVal.put("authorityList", lmAuthorityList);
+
+		log.info("getUsersAuthority");
+		return rtnVal;
+	}
+
+	@Override
+	public Map<String, Object> saveUsersAuthority(UserAuthoritySaveDto params) {
+		
+		// 삭제처리먼저
+		for (UserAuthorityDto curRec : params.getSaveData()) {
+			String sRowStatus = curRec.getRowStatus();
+			if ("D".indexOf(sRowStatus) > -1) {
+				// 사용자
+				userMapper.deleteUserAuthority(curRec);
+			}
+		}
+		// 신규및 업데이트 처리
+		for (UserAuthorityDto curRec : params.getSaveData()) {
+			String sRowStatus = curRec.getRowStatus();
+			if ("N,U".indexOf(sRowStatus) > -1) {
+				// 사용자
+				userMapper.saveUserAuthority(curRec);
+			}
+		}
+
+		Map<String, Object> rtnVal = getUsersAuthority(params.getSearchCond());
+
+		log.info("saveUsersAuthority");
+		return rtnVal;
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/java/daeucna/utils/ConvertUtil.java b/src/main/java/daeucna/utils/ConvertUtil.java
new file mode 100644
index 0000000..d48d4cf
--- /dev/null
+++ b/src/main/java/daeucna/utils/ConvertUtil.java
@@ -0,0 +1,33 @@
+package daeucna.utils;
+
+import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
+import java.util.Locale;
+
+public class ConvertUtil {
+
+	/**
+	 *
+	 * Timestamp 형식의 날짜를 입력한 Format 과 Locale 에 따라 Formatting 한다.
+	 *
+	 * <pre>
+	 *
+	 * [사용 예제]
+	 *
+	 * formatTimestamp("2004-02-25 15:45:31.156","yyyy년MM월dd일",Locale) ===> 2004년02월25일
+	 *
+	 * </pre>
+	 *
+	 * @param timestamp Timestamp 형식의 날짜
+	 * @param format    SimpleDateFormat 에 적용할 format
+	 * @param locale    국가별 LOCALE
+	 * @return java.lang.String
+	 */
+	public static String formatTimestamp(Timestamp timestamp, String format, Locale locale) {
+
+		SimpleDateFormat formatter = new SimpleDateFormat(format, locale);
+		return formatter.format(timestamp);
+
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/java/daeucna/utils/DateUtil.java b/src/main/java/daeucna/utils/DateUtil.java
new file mode 100644
index 0000000..f46c767
--- /dev/null
+++ b/src/main/java/daeucna/utils/DateUtil.java
@@ -0,0 +1,574 @@
+package daeucna.utils;
+
+import java.sql.Timestamp;
+import java.text.ParseException;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.Locale;
+
+public class DateUtil {
+
+	public static java.util.Date formatValidDate(String date, String format, Locale lcal) throws Exception {
+
+		if (date == null || format == null)
+			return null;
+		if (lcal == null)
+			lcal = java.util.Locale.KOREA; // 디폴트는 Korea
+
+		java.text.SimpleDateFormat formatter = new java.text.SimpleDateFormat(format, lcal);
+		java.util.Date formattedDate = null;
+
+		formattedDate = formatter.parse(date);
+
+		return formattedDate;
+	}
+
+	/**
+	 *
+	 * yyyyMMdd Format으로 입력된 날짜에 addDay 만큼 더한 날짜(yyyyMMdd)를 Return한다.
+	 *
+	 * <pre>
+	 *
+	 * [사용 예제]
+	 *
+	 * addDays("20040225", 1) ===> 20040226
+	 *
+	 * </pre>
+	 *
+	 * @param date
+	 * @param addDay
+	 * @return String
+	 * @throws ChainedException
+	 */
+	public static String addDays(String date, int addDay) throws Exception {
+		return addDays(date, "yyyyMMdd", addDay, null);
+	}
+
+	/**
+	 *
+	 * 입력한 날짜를 입력한 Format으로 해석하여 addDay 만큼 더한 날짜를 Return한다.
+	 *
+	 * @param date
+	 * @param addDay 더할 일수
+	 * @param format
+	 * @return String
+	 * @throws ChainedException
+	 */
+	public static String addDays(String date, String format, int addDay, Locale lcal) throws Exception {
+		if (lcal == null)
+			lcal = java.util.Locale.KOREA; // 디폴트는 Korea
+
+		java.text.SimpleDateFormat formatter = new java.text.SimpleDateFormat(format, lcal);
+		java.util.Date formattedDate = formatValidDate(date, format, lcal);
+		formattedDate.setTime(formattedDate.getTime() + ((long) addDay * 1000 * 60 * 60 * 24));
+		return formatter.format(formattedDate);
+	}
+
+	/**
+	 *
+	 * yyyyMMdd Format으로 입력된 날짜에 addMonth 만큼 더한 날짜를 Return한다.
+	 *
+	 * @param date
+	 * @param addMonth 더할 월수
+	 * @return String
+	 * @throws ChainedException
+	 */
+	public static String addMonths(String date, int addMonth) throws Exception {
+		return addMonths(date, "yyyyMMdd", addMonth, null);
+	}
+
+	/**
+	 *
+	 * 입력한 날짜를 입력한 Format으로 해석하여 addMonth 만큼 더한 날짜를 Return한다.
+	 *
+	 * @param date
+	 * @param addMonth 더할 월수
+	 * @param format
+	 * @return String
+	 * @throws ChainedException
+	 */
+	public static String addMonths(String date, String format, int addMonth, Locale lcal) throws Exception {
+		if (lcal == null)
+			lcal = java.util.Locale.KOREA; // 디폴트는 Korea
+		java.text.SimpleDateFormat formatter = new java.text.SimpleDateFormat(format, lcal);
+		java.util.Date formattedDate = formatValidDate(date, format, lcal);
+
+		java.text.SimpleDateFormat yearFormat = new java.text.SimpleDateFormat("yyyy", lcal);
+		java.text.SimpleDateFormat monthFormat = new java.text.SimpleDateFormat("MM", lcal);
+		java.text.SimpleDateFormat dayFormat = new java.text.SimpleDateFormat("dd", lcal);
+
+		int year = Integer.parseInt(yearFormat.format(formattedDate));
+		int month = Integer.parseInt(monthFormat.format(formattedDate));
+		int day = Integer.parseInt(dayFormat.format(formattedDate));
+		month += addMonth;
+		if (addMonth > 0) {
+			while (month > 12) {
+				month -= 12;
+				year += 1;
+			}
+		} else {
+			while (month <= 0) {
+				month += 12;
+				year -= 1;
+			}
+		}
+		java.text.DecimalFormat fourDf = new java.text.DecimalFormat("0000");
+		java.text.DecimalFormat twoDf = new java.text.DecimalFormat("00");
+		String tempDate = String.valueOf(fourDf.format(year)) + String.valueOf(twoDf.format(month))
+				+ String.valueOf(twoDf.format(day));
+		java.util.Date targetDate = null;
+		try {
+			targetDate = formatValidDate(tempDate, "yyyyMMdd", lcal);
+		} catch (Exception e) {
+			day = getLastDay(year, month);
+			tempDate = String.valueOf(fourDf.format(year)) + String.valueOf(twoDf.format(month))
+					+ String.valueOf(twoDf.format(day));
+			targetDate = formatValidDate(tempDate, "yyyyMMdd", lcal);
+		}
+		return formatter.format(targetDate);
+	}
+
+	/**
+	 *
+	 * yyyyMMdd Format으로 입력된 날짜에 addYear 만큼 더한 날짜를 Return한다.
+	 *
+	 * @param date
+	 * @param addYear 더할 년수
+	 * @return String
+	 * @throws ChainedException
+	 */
+	public static String addYears(String date, int addYear) throws Exception {
+		return addYears(date, addYear, "yyyyMMdd", null);
+	}
+
+	/**
+	 *
+	 * 입력한 날짜를 입력한 Format으로 해석하여 addYear 만큼 더한 날짜를 Return한다.
+	 *
+	 * @param date
+	 * @param addYear 더할 년수
+	 * @param format
+	 * @return String
+	 * @throws ChainedException
+	 */
+	public static String addYears(String date, int addYear, String format, Locale lcal) throws Exception {
+		if (lcal == null)
+			lcal = java.util.Locale.KOREA; // 디폴트는 Korea
+
+		java.text.SimpleDateFormat formatter = new java.text.SimpleDateFormat(format, lcal);
+		java.util.Date formattedDate = formatValidDate(date, format, lcal);
+
+		Calendar calendar = new GregorianCalendar();
+		calendar.setTime(formattedDate);
+		calendar.add(Calendar.YEAR, addYear);
+		formattedDate = calendar.getTime();
+
+		return formatter.format(formattedDate);
+
+	}
+
+	/**
+	 *
+	 * 현재 시각을 HHmmss Format 의 String 으로 Return한다.
+	 *
+	 * @return java.lang.String
+	 */
+	public static String getCurrentTimeString() {
+		return getCurrentDateString("HHmmss", null);
+	}
+
+	/**
+	 *
+	 * 현재 날짜와 시각을 yyyy-MM-dd hh:mm:ss.fffffffff Format의 Timestamp 로 Return한다.
+	 *
+	 * @return Timestamp
+	 */
+	public static Timestamp getCurrentTimeStamp() {
+		return new Timestamp(new GregorianCalendar().getTime().getTime());
+	}
+
+	/**
+	 *
+	 * 현재 날짜를 yyyyMMdd Format 의 String 으로 Return한다.
+	 *
+	 * @return java.lang.String
+	 */
+	public static String getCurrentDateString() {
+		return getCurrentDateString("yyyyMMdd", null);
+	}
+
+	/**
+	 *
+	 * 현재 날짜를 주어진 Format 의 String 으로 Return한다.
+	 *
+	 * <pre>
+	 *
+	 * [사용 예제]
+	 *
+	 * CDateUtil.getCurrentDateString("yyyy/MM/dd") ===> 2004/02/24
+	 * CDateUtil.getCurrentDateString("HH:mm:ss")); ===> 13:40:05
+	 * CDateUtil.getCurrentDateString("hh:mm:ss")); ===> 01:40:05
+	 *
+	 * format :  h        hour in am/pm (1~12)  
+	 * format :  H        hour in day (0~23)
+	 *
+	 * </pre>
+	 *
+	 * @param format
+	 * @return java.lang.String
+	 */
+	public static String getCurrentDateString(String format, Locale lcal) {
+		if (lcal == null) lcal = java.util.Locale.KOREA;
+		return ConvertUtil.formatTimestamp(getCurrentTimeStamp(), format, lcal);
+	}
+
+	/**
+	 *
+	 * yyyyMMdd Format으로 입력된 날짜가 유효한 날짜인지 확인한다.
+	 *
+	 * <pre>
+	 *
+	 * [사용 예제]
+	 *
+	 * CDateUtil.isValidDate("20050225") ===> true
+	 *
+	 * </pre>
+	 *
+	 * @param date
+	 * @return boolean
+	 * @throws ChainedException
+	 */
+	public static boolean isValidDate(String date) throws Exception {
+		return DateUtil.isValidDate(date, "yyyyMMdd", null);
+	}
+
+	/**
+	 *
+	 * 입력된 날짜와 입력된 Format 으로 해석하여 입력된 날짜가 유효한 날짜인지 확인한다.
+	 *
+	 * <pre>
+	 *
+	 * [사용 예제]
+	 *
+	 * CDateUtil.isValidDate("2004-02-99","yyyy-MM-dd") ===> false
+	 *
+	 * </pre>
+	 *
+	 * @param date
+	 * @return boolean
+	 * @throws ChainedException
+	 */
+	public static boolean isValidDate(String date, String format, Locale lcal) throws Exception {
+		if (lcal == null)
+			lcal = java.util.Locale.KOREA;
+		try {
+			java.text.SimpleDateFormat formatter = new java.text.SimpleDateFormat(format, lcal);
+			java.util.Date formattedDate = null;
+
+			try {
+
+				formattedDate = formatter.parse(date);
+
+			} catch (java.text.ParseException e) {
+				return false;
+			}
+
+			if (!formatter.format(formattedDate).equals(date))
+				return false;
+
+			return true;
+		} catch (Exception e) {
+			return false;
+		}
+	}
+
+	/**
+	 *
+	 * yyyyMMdd Format으로 입력된 from 날짜와 to 날짜 사이의 일수를 Return한다.
+	 *
+	 * <pre>
+	 *
+	 * [사용 예제]
+	 *
+	 * daysBetween("20040225", "20040301") ===> 5
+	 *
+	 * </pre>
+	 *
+	 * @param from
+	 * @param to
+	 * @return int
+	 * @throws ChainedException
+	 */
+	public static int getDaysBetween(String from, String to) throws Exception {
+		return getDaysBetween(from, to, "yyyyMMdd", null);
+	}
+
+	/**
+	 *
+	 * 입력된 from 날짜와 to 날짜를 입력된 Format으로 해석하여 날짜 사이의 일수를 Return한다.
+	 *
+	 * <pre>
+	 *
+	 * [사용 예제]
+	 *
+	 * daysBetween("2004-02-25", "2004-03-01", "yyyy-MM-dd") ===> 5
+	 *
+	 * </pre>
+	 *
+	 * @param from
+	 * @param to
+	 * @param format
+	 * @return int
+	 * @throws ChainedException
+	 */
+	public static int getDaysBetween(String from, String to, String format, Locale lcal) throws Exception {
+		if (lcal == null)
+			lcal = java.util.Locale.KOREA;
+		java.util.Date d1 = formatValidDate(from, format, lcal);
+		java.util.Date d2 = formatValidDate(to, format, lcal);
+		long duration = d2.getTime() - d1.getTime();
+		return (int) (duration / (1000 * 60 * 60 * 24));
+	}
+
+	/**
+	 *
+	 * yyyyMMdd Format으로 입력된 from 날짜와 to 날짜 사이의 월수를 Return한다.
+	 *
+	 * <pre>
+	 *
+	 * [사용 예제]
+	 *
+	 * monthsBetween("20040225", "20041001") ===> 8
+	 *
+	 * </pre>
+	 *
+	 * @param from
+	 * @param to
+	 * @return int
+	 * @throws ChainedException
+	 */
+	public static int getMonthsBetween(String from, String to) throws Exception {
+		return getMonthsBetween(from, to, "yyyyMMdd", null);
+	}
+
+	/**
+	 *
+	 * 입력된 from 날짜와 to 날짜를 입력된 Format으로 해석하여 날짜 사이의 월수를 Return한다.
+	 *
+	 * <pre>
+	 *
+	 * [사용 예제]
+	 *
+	 * monthsBetween("2004-02-25", "2004-10-01", "yyyy-MM-dd") ===> 8
+	 *
+	 * </pre>
+	 *
+	 * @param from
+	 * @param to
+	 * @param format
+	 * @return int
+	 * @throws ChainedException
+	 */
+	public static int getMonthsBetween(String from, String to, String format, Locale lcal) throws Exception {
+		if (lcal == null)
+			lcal = java.util.Locale.KOREA;
+		java.util.Date fromDate = formatValidDate(from, format, lcal);
+		java.util.Date toDate = formatValidDate(to, format, lcal);
+		// if two date are same, return 0.
+		if (fromDate.compareTo(toDate) == 0)
+			return 0;
+		java.text.SimpleDateFormat yearFormat = new java.text.SimpleDateFormat("yyyy", lcal);
+		java.text.SimpleDateFormat monthFormat = new java.text.SimpleDateFormat("MM", lcal);
+		java.text.SimpleDateFormat dayFormat = new java.text.SimpleDateFormat("dd", lcal);
+		int fromYear = Integer.parseInt(yearFormat.format(fromDate));
+		int toYear = Integer.parseInt(yearFormat.format(toDate));
+		int fromMonth = Integer.parseInt(monthFormat.format(fromDate));
+		int toMonth = Integer.parseInt(monthFormat.format(toDate));
+		int fromDay = Integer.parseInt(dayFormat.format(fromDate));
+		int toDay = Integer.parseInt(dayFormat.format(toDate));
+		int result = 0;
+		result += ((toYear - fromYear) * 12);
+		result += (toMonth - fromMonth);
+		// if (((toDay - fromDay) < 0) ) result += fromDate.compareTo(toDate);
+		// ceil과 floor의 효과
+		if (((toDay - fromDay) > 0))
+			result += toDate.compareTo(fromDate);
+		return result;
+	}
+
+	/**
+	 *
+	 * yyyyMMdd Format으로 입력된 from 날짜와 to 날짜 사이의 년수를 Return한다.
+	 *
+	 * <pre>
+	 *
+	 * [사용 예제]
+	 * yearsBetween("20040225", "20071001") ===> 3
+	 *
+	 * </pre>
+	 *
+	 * @param from
+	 * @param to
+	 * @return int
+	 * @throws ChainedException
+	 */
+	public static int getYearsBetween(String from, String to) throws Exception {
+		return getYearsBetween(from, to, "yyyyMMdd", null);
+	}
+
+	/**
+	 *
+	 * 입력된 from 날짜와 to 날짜를 입력된 Format으로 해석하여 날짜 사이의 년수를 Return한다.
+	 *
+	 * <pre>
+	 *
+	 * [사용 예제]
+	 *
+	 * yearsBetween("2004-02-25", "2007-10-01", "yyyy-MM-dd") ===> 3
+	 *
+	 * </pre>
+	 *
+	 * @param from
+	 * @param to
+	 * @param format
+	 * @return int
+	 * @throws ChainedException
+	 */
+	public static int getYearsBetween(String from, String to, String format, Locale lcal) throws Exception {
+		if (lcal == null)
+			lcal = java.util.Locale.KOREA;
+		return (int) (getDaysBetween(from, to, format, lcal) / 365);
+	}
+
+	/**
+	 *
+	 * yyyyMMdd Format으로 입력된 날짜에서 해당 년월의 마지막 날짜를 Return한다.
+	 *
+	 * <pre>
+	 *
+	 * [사용 예제]
+	 *
+	 * lastDayOfMonth("20040202") ===> 20040229
+	 *
+	 * </pre>
+	 *
+	 * @param date
+	 * @return String
+	 * @throws ChainedException
+	 */
+	public static String getLastDayOfMonth(String date) throws Exception {
+		return getLastDayOfMonth(date, "yyyyMMdd", null);
+	}
+
+	/**
+	 *
+	 * 입력된 날짜을 입력된 Format 으로 해석하여 그 날짜에서 해당 년월의 마지막 날짜를 Return한다.
+	 *
+	 * <pre>
+	 *
+	 * [사용 예제]
+	 *
+	 * lastDayOfMonth("20040202", "yyyyMMdd") ===> 20040429
+	 *
+	 * </pre>
+	 *
+	 * @param date
+	 * @param format
+	 * @return String
+	 * @throws ChainedException
+	 */
+	public static String getLastDayOfMonth(String date, String format, Locale lcal) throws Exception {
+		if (lcal == null)
+			lcal = java.util.Locale.KOREA;
+		java.text.SimpleDateFormat formatter = new java.text.SimpleDateFormat(format, lcal);
+		java.util.Date formattedDate = formatValidDate(date, format, lcal);
+		java.text.SimpleDateFormat yearFormat = new java.text.SimpleDateFormat("yyyy", lcal);
+		java.text.SimpleDateFormat monthFormat = new java.text.SimpleDateFormat("MM", lcal);
+		int year = Integer.parseInt(yearFormat.format(formattedDate));
+		int month = Integer.parseInt(monthFormat.format(formattedDate));
+		int day = getLastDay(year, month);
+		java.text.DecimalFormat fourDf = new java.text.DecimalFormat("0000");
+		java.text.DecimalFormat twoDf = new java.text.DecimalFormat("00");
+		String tempDate = String.valueOf(fourDf.format(year)) + String.valueOf(twoDf.format(month))
+				+ String.valueOf(twoDf.format(day));
+		java.util.Date targetDate = formatValidDate(tempDate, "yyyyMMdd", lcal);
+		return formatter.format(targetDate);
+	}
+
+	/**
+	 *
+	 * 입력된 년도와 입력된 월의 마지막 일를 Return한다.
+	 *
+	 * <pre>
+	 *
+	 * [사용 예제]
+	 *
+	 * lastDay(2004,02) ===> 29
+	 *
+	 * </pre>
+	 *
+	 * @param year
+	 * @param month
+	 * @return int
+	 * @throws ParseException
+	 */
+	public static int getLastDay(int year, int month) throws java.text.ParseException {
+		int day = 0;
+		switch (month) {
+		case 1:
+		case 3:
+		case 5:
+		case 7:
+		case 8:
+		case 10:
+		case 12:
+			day = 31;
+			break;
+		case 2:
+			if ((year % 4) == 0) {
+				if ((year % 100) == 0 && (year % 400) != 0) {
+					day = 28;
+				} else {
+					day = 29;
+				}
+			} else {
+				day = 28;
+			}
+			break;
+		default:
+			day = 30;
+		}
+		return day;
+	}
+
+	/**
+	 *
+	 * 현재 시간을 Long Type 으로 Return한다. (워크플로우 작업이력저장 용도)
+	 *
+	 * <pre>
+	 *
+	 * [사용 예제]
+	 *
+	 * DateUtil.getCurrentTime()
+	 *
+	 * </pre>
+	 * 
+	 * @return Long
+	 * @throws Exception
+	 */
+	public static Long getCurrentTime() throws Exception {
+		java.util.Date date = new java.util.Date();
+
+		long ltime1 = date.getTime(); // 현재시간
+
+		Calendar cal = Calendar.getInstance();
+		cal.set(1970, 0, 1, 9, 0, 0);// 파일넷 기준시간
+
+		long ltime2 = cal.getTimeInMillis();
+
+		long curTime = ltime1 - ltime2;
+
+		return new Long(curTime / 1000);
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/java/daeucna/utils/JsonUtil.java b/src/main/java/daeucna/utils/JsonUtil.java
new file mode 100644
index 0000000..10c053e
--- /dev/null
+++ b/src/main/java/daeucna/utils/JsonUtil.java
@@ -0,0 +1,19 @@
+package daeucna.utils;
+
+import daeucna.config.security.utils.CommonJson;
+
+public class JsonUtil {
+
+	public static String objectToString(Object object) {
+		return CommonJson.objectToString(object);
+	}
+
+	public static Object stringToObject(String sJson, Class<?> objClass) {
+		return CommonJson.stringToObject(sJson, objClass);
+	}
+
+	public static Object objectToObject(Object object, Class<?> objClass) {
+		return CommonJson.objectToObject(object, objClass);
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/java/daeucna/utils/StringUtil.java b/src/main/java/daeucna/utils/StringUtil.java
new file mode 100644
index 0000000..9aaf500
--- /dev/null
+++ b/src/main/java/daeucna/utils/StringUtil.java
@@ -0,0 +1,106 @@
+package daeucna.utils;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.Vector;
+
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * <p>
+ * <code>StringUtil</code> 은 String의 handling과 관련된 class이다.
+ * <p>
+ */
+
+public class StringUtil {
+	/**
+	 * lPad(inStr, iSize, sPadStr)
+	 * 
+	 * @param inStr
+	 * @param iSize
+	 * @param sPadStr
+	 * @return
+	 */
+	public static String leftPad(String inStr, int iSize, String sPadStr) {
+		return StringUtils.leftPad(inStr, iSize, sPadStr);
+	}
+
+	/**
+	 * rPad(inStr, iSize, sPadStr)
+	 * 
+	 * @param inStr
+	 * @param iSize
+	 * @param sPadStr
+	 * @return
+	 */
+	public static String rightPad(String inStr, int iSize, String sPadStr) {
+		return StringUtils.rightPad(inStr, iSize, sPadStr);
+	}
+
+	/**
+	 * inStr이 null/""/"공백문자" 이면 default
+	 * 
+	 * @param inStr
+	 * @param sDefault
+	 * @return
+	 */
+	public static String defaultIfBlank(String inStr, String sDefault) {
+		return StringUtils.defaultIfBlank(inStr, sDefault);
+	}
+
+	/**
+	 * inStr이 null/"" 이면 default
+	 * 
+	 * @param inStr
+	 * @param sDefault
+	 * @return
+	 */
+	public static String defaultIfEmpty(String inStr, String sDefault) {
+		return StringUtils.defaultIfEmpty(inStr, sDefault);
+	}
+
+	/**
+	 * Strip 결과가 Null이나 ""이면 ""
+	 * 
+	 * @param inStr
+	 * @param sDefault
+	 * @return
+	 */
+	public static String stripToEmpty(String inStr) {
+		return StringUtils.stripToEmpty(inStr);
+	}
+
+	/**
+	 * Strip 결과가 "" 이면 NULL
+	 * 
+	 * @param inStr
+	 * @param sDefault
+	 * @return
+	 */
+	public static String stripToNull(String inStr) {
+		return StringUtils.stripToNull(inStr);
+	}
+
+	public static String remove(String inStr, String sRemoveStr) {
+		return StringUtils.remove(inStr, sRemoveStr);
+	}
+
+	public static String replace(String inStr, String sTargetStr, String sReplaceStr) {
+		return StringUtils.replace(sTargetStr, inStr, sReplaceStr);
+	}
+
+	public static String trimToEmpty(String inStr) {
+		return StringUtils.trimToEmpty(inStr);
+	}
+
+	public static String trimToNull(String inStr) {
+		return StringUtils.trimToNull(inStr);
+	}
+
+}
\ No newline at end of file
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 598f3a6..3dff2c4 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -17,9 +17,9 @@ spring.jpa.defer-datasource-initialization=true
 ## Datasource
 # primary
 spring.datasource.hikari.primary.driver-class-name=org.postgresql.Driver
-spring.datasource.hikari.primary.jdbc-url=jdbc:postgresql://daeuserver.iptime.org:20430/account
-spring.datasource.hikari.primary.username=account
-spring.datasource.hikari.primary.password=daeucna10!
+spring.datasource.hikari.primary.jdbc-url=jdbc:postgresql://localhost:5432/sangkiham
+spring.datasource.hikari.primary.username=sangkiham
+spring.datasource.hikari.primary.password=sangkiham
 
 # secondary
 #spring.datasource.hikari.secondary.driver-class-name=oracle.jdbc.driver.OracleDriver
diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql
index 3451d94..e588f38 100644
--- a/src/main/resources/data.sql
+++ b/src/main/resources/data.sql
@@ -21,21 +21,25 @@ WHEN NOT MATCHED THEN
 MERGE INTO users m
 USING (
 	SELECT
-		1 as user_id, 
 		true as activated, 
 		'sangkiham' as nickname, 
 		'$2a$10$nyHQj.Nj2tID4UzIkd1/SuMeYwlKaaHT8Gi3Wgg2x/h9K9qLQciLO' as password, 
 		'sangkiham' as username
 	) s
 ON
-	m.user_id = s.user_id
+	m.username = s.username
+WHEN MATCHED THEN 
+	UPDATE SET
+		nickname = s.nickname
+		, activated = s.activated
+		, password = s.password
 WHEN NOT MATCHED THEN 
-	INSERT (user_id, activated, nickname, password, username) VALUES (s.user_id, s.activated, s.nickname, s.password, s.username);
+	INSERT (activated, nickname, password, username) VALUES (s.activated, s.nickname, s.password, s.username);
 
 MERGE INTO user_authority m
 USING (
 	SELECT
-		1 as user_id, 
+		(SELECT user_id FROM users WHERE username = 'sangkiham') as user_id, 
 		'ROLE_ADMIN' as authority_name 
 	) s
 ON
diff --git a/src/main/resources/mybatis/mybatis-config.xml b/src/main/resources/mybatis/mybatis-config.xml
index 31f7889..bafaa0a 100644
--- a/src/main/resources/mybatis/mybatis-config.xml
+++ b/src/main/resources/mybatis/mybatis-config.xml
@@ -22,6 +22,8 @@
 	<!-- 별칭 -->
 	<typeAliases>
 		<typeAlias type="daeucna.system.code.CodeDto" alias="CodeDto"/>
+		<typeAlias type="daeucna.system.user.UserDto" alias="UserDto"/>
+		<typeAlias type="daeucna.system.user.UserAuthorityDto" alias="UserAuthorityDto"/>
 	</typeAliases>
 
 </configuration>
\ No newline at end of file
diff --git a/src/main/resources/mybatis/primary/system/UserMapper.xml b/src/main/resources/mybatis/primary/system/UserMapper.xml
new file mode 100644
index 0000000..724decd
--- /dev/null
+++ b/src/main/resources/mybatis/primary/system/UserMapper.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="daeucna.mapper.primary.system.UserMapper">
+	
+    <select id="getUsers" parameterType="UserDto" resultType="UserDto">
+		SELECT
+		    m.user_id
+		    , m.activated
+		    , m.nickname
+		    , null as password
+			, m.username 
+		FROM public.users m
+		ORDER BY 
+		    m.username
+    </select>
+    
+    <update id="saveUser" parameterType="UserDto">
+		MERGE INTO public.users m
+		USING (
+			SELECT
+			    #{activated} as activated
+			    , #{nickname} as nickname
+			    , #{username} as username
+				<if test='password != null and !password.equals("")'>
+				    , #{password} as password
+				</if>									
+		) s
+		ON (
+			m.username = s.username
+		)
+		WHEN MATCHED THEN
+			UPDATE SET
+				activated = s.activated
+				, nickname = s.nickname
+				, username = s.username
+				<if test='password != null and !password.equals("")'>
+					, password = s.password
+				</if>									
+		WHEN NOT MATCHED THEN
+			INSERT (
+				activated	
+				, nickname
+				, username
+				<if test='password != null and !password.equals("")'>
+					, password
+				</if>									
+			) VALUES (
+				s.activated	
+				, s.nickname
+				, s.username
+				<if test='password != null and !password.equals("")'>
+					, s.password
+				</if>									
+			)
+    </update>
+    
+    <delete id="deleteUser" parameterType="UserDto">
+		DELETE FROM public.users m
+		WHERE
+			user_id = #{userId}
+    </delete>
+            
+            
+    <select id="getUsersAuthority" parameterType="UserAuthorityDto" resultType="UserAuthorityDto">
+		SELECT 
+			m.user_id
+			, s1.username
+			, s2.authority_name
+		FROM public.user_authority m
+			inner join public.users s1
+			on s1.user_id = m.user_id
+			inner join public.authority s2
+			on s2.authority_name = m.authority_name
+		WHERE 1=1
+			<if test='username != null and !username.equals("")'>
+				and s1.username like ('%' || #{username} || '%')
+			</if>									
+		ORDER BY m.user_id ASC
+    </select>
+            
+    <update id="saveUserAuthority" parameterType="UserAuthorityDto">
+		MERGE INTO public.user_authority m
+		USING (
+			SELECT
+			    (SELECT user_id FROM public.users WHERE username=#{username}) as user_id
+			    , #{authorityName} as authority_name
+		) s
+		ON (
+			m.user_id = s.user_id
+		)
+		WHEN MATCHED THEN
+			UPDATE SET
+				authority_name = s.authority_name
+		WHEN NOT MATCHED THEN
+			INSERT (
+				user_id	
+				, authority_name
+			) VALUES (
+				s.user_id	
+				, s.authority_name
+			)
+    </update>
+    
+    <delete id="deleteUserAuthority" parameterType="UserAuthorityDto">
+		DELETE FROM public.user_authority m
+		WHERE
+			user_id = #{userId}
+    </delete>
+                     
+    <select id="getUserList" parameterType="Map" resultType="Map">
+		SELECT 
+			user_id
+			, username
+		FROM public.users
+		WHERE 
+			activated = true
+		ORDER BY username ASC
+    </select>
+
+    <select id="getAuthorityList" parameterType="Map" resultType="Map">
+		SELECT 
+			authority_name
+		FROM public.authority
+		ORDER BY authority_name ASC
+    </select>
+                        
+</mapper>
\ No newline at end of file
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
index 48cecfc..0d38f7c 100644
--- a/src/main/resources/schema.sql
+++ b/src/main/resources/schema.sql
@@ -223,7 +223,6 @@ CREATE TABLE IF NOT EXISTS batch_user_job_status
     exit_code character varying(10) COLLATE pg_catalog."default",
     exit_message character varying(2000) COLLATE pg_catalog."default",
     CONSTRAINT batch_user_job_status_pkey PRIMARY KEY (user_job_id)
-        USING INDEX TABLESPACE account
 );
 
 COMMENT ON TABLE batch_user_job_status
@@ -267,12 +266,12 @@ CREATE TABLE IF NOT EXISTS user_authority
     CONSTRAINT user_authority_pkey PRIMARY KEY (user_id, authority_name),
     CONSTRAINT fk6ktglpl5mjosa283rvken2py5 FOREIGN KEY (authority_name)
         REFERENCES authority (authority_name) MATCH SIMPLE
-        ON UPDATE NO ACTION
-        ON DELETE NO ACTION,
+        ON UPDATE CASCADE
+        ON DELETE CASCADE,
     CONSTRAINT fkhi46vu7680y1hwvmnnuh4cybx FOREIGN KEY (user_id)
         REFERENCES users (user_id) MATCH SIMPLE
-        ON UPDATE NO ACTION
-        ON DELETE NO ACTION
+        ON UPDATE CASCADE
+        ON DELETE CASCADE
 );
 
 -- Table: sy_cmmn_code_mng
--
libgit2 0.21.4