From b9f2dd46768dc0fb03c465822ad5ea60242d468e Mon Sep 17 00:00:00 2001
From: Jeon <junyaup@ectech.co.kr>
Date: Wed, 19 Jul 2023 11:20:01 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B6=8C=ED=95=9C=20=EA=B4=80=EB=A6=AC=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/assets/css/style.css                         | 2 +-
 frontend/src/modules/sysMgt/views/AuthAdd.vue             | 6 +++---
 frontend/src/modules/sysMgt/views/AuthModify.vue          | 6 +++---
 src/main/java/kr/co/uplus/ez/api/sysMgt/dto/AuthMenu.java | 2 ++
 src/main/resources/mapper/mysql/sysMgt/sysMgt-mapper.xml  | 1 +
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/frontend/src/assets/css/style.css b/frontend/src/assets/css/style.css
index bde7e71..ce66934 100644
--- a/frontend/src/assets/css/style.css
+++ b/frontend/src/assets/css/style.css
@@ -1898,7 +1898,7 @@ textarea:focus{
   box-sizing: border-box;
   float: left;
   width: 20%;
-  height: 165px;
+  height: auto;
   padding-top: 10px;
 }
 
diff --git a/frontend/src/modules/sysMgt/views/AuthAdd.vue b/frontend/src/modules/sysMgt/views/AuthAdd.vue
index ac08d7b..4c4d81d 100644
--- a/frontend/src/modules/sysMgt/views/AuthAdd.vue
+++ b/frontend/src/modules/sysMgt/views/AuthAdd.vue
@@ -44,15 +44,15 @@
               <div class="div_authcheck" v-for="(upper, i) in list" v-bind:key="i">
                 <p>{{ upper.name }}</p>
                 <div v-for="(auth, x) in upper.list" v-bind:key="x" >
-                  <div v-if="auth.menuNo !== '2002' && auth.menuNo !== '2003'">
+                  <div v-if="!(auth.autchkGrpno !== '' && auth.autchkGrpno !== null)">
                     <input type="checkbox" :id="'right_check'+auth.menuNo" :value="auth.menuNo" v-model="checkedAuthMenu"/>
                     <div class="label_group">
                       <label :for="'right_check'+auth.menuNo"></label>
                       <label :for="'right_check'+auth.menuNo">{{auth.name}}</label>
                     </div>
                   </div>
-                  <div v-if="auth.menuNo == '2002' || auth.menuNo == '2003'">
-                    <input type="checkbox" name="oneCheck" :id="'right_check'+auth.menuNo" :value="auth.menuNo" @change="channelCheck" v-model="checkedAuthMenu"/>
+                  <div v-if="auth.autchkGrpno !== '' && auth.autchkGrpno !== null">
+                    <input type="checkbox" :name="'oneCheck'+upper.menuNo+auth.autchkGrpno" :id="'right_check'+auth.menuNo" :value="auth.menuNo" @change="channelCheck" v-model="checkedAuthMenu"/>
                     <div class="label_group">
                       <label :for="'right_check'+auth.menuNo"></label>
                       <label :for="'right_check'+auth.menuNo">{{auth.name}}</label>
diff --git a/frontend/src/modules/sysMgt/views/AuthModify.vue b/frontend/src/modules/sysMgt/views/AuthModify.vue
index 0c3b8c4..b70ee5b 100644
--- a/frontend/src/modules/sysMgt/views/AuthModify.vue
+++ b/frontend/src/modules/sysMgt/views/AuthModify.vue
@@ -45,15 +45,15 @@
             <div class="div_authcheck" v-for="(upper, i) in list" v-bind:key="i">
               <p>{{ upper.name }}</p>
               <div v-for="(auth, x) in upper.list" v-bind:key="x" >
-                <div v-if="auth.menuNo !== '2002' && auth.menuNo !== '2003'">
+                <div v-if="!(auth.autchkGrpno !== '' && auth.autchkGrpno !== null)">
                   <input type="checkbox" :id="'right_check'+auth.menuNo" :value="auth.menuNo" v-model="checkedAuthMenu"/>
                   <div class="label_group">
                     <label :for="'right_check'+auth.menuNo"></label>
                     <label :for="'right_check'+auth.menuNo">{{auth.name}}</label>
                   </div>
                 </div>
-                <div v-if="auth.menuNo == '2002' || auth.menuNo == '2003'">
-                  <input type="checkbox" name="oneCheck" :id="'right_check'+auth.menuNo" :value="auth.menuNo" @change="channelCheck" v-model="checkedAuthMenu"/>
+                <div v-if="auth.autchkGrpno !== '' && auth.autchkGrpno !== null">
+                  <input type="checkbox" :name="'oneCheck'+upper.menuNo+auth.autchkGrpno" :id="'right_check'+auth.menuNo" :value="auth.menuNo" @change="channelCheck" v-model="checkedAuthMenu"/>
                   <div class="label_group">
                     <label :for="'right_check'+auth.menuNo"></label>
                     <label :for="'right_check'+auth.menuNo">{{auth.name}}</label>
diff --git a/src/main/java/kr/co/uplus/ez/api/sysMgt/dto/AuthMenu.java b/src/main/java/kr/co/uplus/ez/api/sysMgt/dto/AuthMenu.java
index 6fad0a4..1c3322c 100644
--- a/src/main/java/kr/co/uplus/ez/api/sysMgt/dto/AuthMenu.java
+++ b/src/main/java/kr/co/uplus/ez/api/sysMgt/dto/AuthMenu.java
@@ -21,4 +21,6 @@ public class AuthMenu implements Serializable{
 	private String useYn;
 	@ApiModelProperty(example = "메뉴레벨", name = "메뉴레벨", dataType = "String")
 	private String menuLv;
+	@ApiModelProperty(example = "메뉴그룹", name = "메뉴그룹", dataType = "String")
+	private String autchkGrpno;
 }
diff --git a/src/main/resources/mapper/mysql/sysMgt/sysMgt-mapper.xml b/src/main/resources/mapper/mysql/sysMgt/sysMgt-mapper.xml
index 4d1411b..cbbdfd3 100644
--- a/src/main/resources/mapper/mysql/sysMgt/sysMgt-mapper.xml
+++ b/src/main/resources/mapper/mysql/sysMgt/sysMgt-mapper.xml
@@ -543,6 +543,7 @@
 			, A.MENU_NO
 			, A.MENU_NM AS NAME
 			, A.MENU_LVL AS MENU_LV
+			, A.AUTCHK_GRPNO
 		FROM hubez_admin.EZ_ADM_MENU A
 		WHERE A.MENU_LVL = 2
 			AND A.USE_YN = 'Y'