From 0f953fb62076abb7681b72a3f96566e3565c3b6e Mon Sep 17 00:00:00 2001
From: kimre <kimre@LAPTOP-O2O1741K>
Date: Tue, 19 Jul 2022 19:52:34 +0900
Subject: [PATCH] =?UTF-8?q?TC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attractMgt/views/ChannelDetail.vue        |  5 +-
 .../custMgt/views/MemberAdminDetail.vue       |  9 ++-
 .../modules/custMgt/views/MemberDetail.vue    | 10 ++-
 .../sendNumMgt/components/ApprDetailPop.vue   |  4 +-
 frontend/src/store/dataStore.js               | 66 +++++++++----------
 .../ez/api/sendNumMgt/SendNumMgtService.java  |  2 +-
 6 files changed, 56 insertions(+), 40 deletions(-)

diff --git a/frontend/src/modules/attractMgt/views/ChannelDetail.vue b/frontend/src/modules/attractMgt/views/ChannelDetail.vue
index f6e0dd9..1fcadf0 100644
--- a/frontend/src/modules/attractMgt/views/ChannelDetail.vue
+++ b/frontend/src/modules/attractMgt/views/ChannelDetail.vue
@@ -236,7 +236,10 @@ export default {
       this.channelDetail(userSeq);  
     }    
   },
-
+  destroyed() {
+    this.$store.commit('dataStore/updateUserSeq', '');
+    this.$store.commit('dataStore/updateUserId', '');
+  },
   methods: {
     async channelDetail(userSeq) {
       this.row.userSeq = userSeq;
diff --git a/frontend/src/modules/custMgt/views/MemberAdminDetail.vue b/frontend/src/modules/custMgt/views/MemberAdminDetail.vue
index d0f1829..361f6a2 100644
--- a/frontend/src/modules/custMgt/views/MemberAdminDetail.vue
+++ b/frontend/src/modules/custMgt/views/MemberAdminDetail.vue
@@ -253,7 +253,13 @@ export default {
     ValidationConfirmPop,
   },
   created() {
-    this.memberDetail(this.$route.params.serviceId);
+    if(this.$route.params.serviceId != null){
+      this.$store.commit('dataStore/updateUserId', this.$route.params.serviceId);
+      this.memberDetail(this.$route.params.serviceId);
+    }else{
+      var userId = this.$store.getters["dataStore/getUserId"];
+      this.memberDetail(userId);
+    }
   },
   destroyed() {
     this.$store.commit('searchcondition/updateSearchCondition', {
@@ -265,6 +271,7 @@ export default {
         searchText1: '',
       },
     });
+    this.$store.commit('dataStore/updateUserId', '');
   },
   mounted() {},
   computed: {
diff --git a/frontend/src/modules/custMgt/views/MemberDetail.vue b/frontend/src/modules/custMgt/views/MemberDetail.vue
index d7bf688..046c95d 100644
--- a/frontend/src/modules/custMgt/views/MemberDetail.vue
+++ b/frontend/src/modules/custMgt/views/MemberDetail.vue
@@ -133,10 +133,16 @@ export default {
     ValidationConfirmPop,
   },
   created(){            
-	this.memberDetail(this.$route.params.serviceId);
+	if(this.$route.params.serviceId != null){
+      this.$store.commit('dataStore/updateUserId', this.$route.params.serviceId);
+      this.memberDetail(this.$route.params.serviceId);
+    }else{
+      var userId = this.$store.getters["dataStore/getUserId"];
+      this.memberDetail(userId);
+    }
   },  
   destroyed() {
-       
+    this.$store.commit('dataStore/updateUserId', '');
   },
   mounted() {
     
diff --git a/frontend/src/modules/sendNumMgt/components/ApprDetailPop.vue b/frontend/src/modules/sendNumMgt/components/ApprDetailPop.vue
index 563f40b..22d596c 100644
--- a/frontend/src/modules/sendNumMgt/components/ApprDetailPop.vue
+++ b/frontend/src/modules/sendNumMgt/components/ApprDetailPop.vue
@@ -46,7 +46,7 @@
                   총<span>{{ numList.length }}</span>건
                 </div>
                 <div class="radio_group">
-                  <input type="radio" name="state" ref="apprRadio" value="01" id="popup_radio13" @change="allApprSttus($event)">
+                  <input type="radio" name="state" ref="apprRadio" value="02" id="popup_radio13" @change="allApprSttus($event)">
                   <label for="popup_radio13">전체승인</label>
                   <input type="radio" name="state" ref="rejRadio" value="03" id="popup_radio14" @change="allApprSttus($event)">
                   <label for="popup_radio14">전체반려</label>
@@ -55,7 +55,7 @@
               <ul>
                 <li v-for="(item, idx) in numList">{{idx+1}}. {{ item.sndrno }}
                   <div class="select-btn">
-                    <button :class="{'btn-pcolor' : item.sttusCd === '01' || item.sttusCd === '02', 'btn-default' : item.sttusCd === '03'}" @click="change(idx, '01')">승인</button>
+                    <button :class="{'btn-pcolor' : item.sttusCd === '02', 'btn-default' : item.sttusCd === '01' || item.sttusCd === '03'}" @click="change(idx, '02')">승인</button>
                     <button :class="{'btn-pcolor' : item.sttusCd === '03', 'btn-default' : item.sttusCd === '01' || item.sttusCd === '02'}" @click="change(idx, '03')">반려</button>
                   </div>
                 </li>
diff --git a/frontend/src/store/dataStore.js b/frontend/src/store/dataStore.js
index f6a10a0..80b2413 100644
--- a/frontend/src/store/dataStore.js
+++ b/frontend/src/store/dataStore.js
@@ -1,34 +1,34 @@
-const state = {
-  dataStore: ''
-  ,userSeq: ''
-  ,userId: ''
-}
-
-const getters = {
-  getDataStore: state => state.dataStore,
-  getUserSeq: state => state.userSeq,
-  getUserId: state => state.userId,
-}
-
-const mutations = {
-  updateDataStore: (state, data) => {
-    state.dataStore = data;
-  },
-  updateUserSeq: (state, data) => {
-    state.userSeq = data;
-  },
-  updateUserId: (state, data) => {
-    state.userId = data;
-  }
-}
-
-const actions = {
-}
-
-export default {
-  namespaced: true,
-  state,
-  getters,
-  mutations,
-  actions
+const state = {
+  dataStore: ''
+  ,userSeq: ''
+  ,userId: ''
+}
+
+const getters = {
+  getDataStore: state => state.dataStore,
+  getUserSeq: state => state.userSeq,
+  getUserId: state => state.userId,
+}
+
+const mutations = {
+  updateDataStore: (state, data) => {
+    state.dataStore = data;
+  },
+  updateUserSeq: (state, data) => {
+    state.userSeq = data;
+  },
+  updateUserId: (state, data) => {
+    state.userId = data;
+  }
+}
+
+const actions = {
+}
+
+export default {
+  namespaced: true,
+  state,
+  getters,
+  mutations,
+  actions
 };
\ No newline at end of file
diff --git a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java
index 74afef1..60d1f7b 100644
--- a/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java
+++ b/src/main/java/kr/co/uplus/ez/api/sendNumMgt/SendNumMgtService.java
@@ -456,7 +456,7 @@ public class SendNumMgtService {
 		int apvCnt = 0;
 		int rejtCnt = 0;
 		for(UpdateApprSendNumber updateApprSendNumber: updateApprReqDto.getList()){
-			if(StringUtils.equals(Const.SNDRNO_STTUS_CD_APPR, updateApprSendNumber.getSttusCd())){
+			if(StringUtils.equals(Const.SNDRNO_STTUS_CD_COMPLETED, updateApprSendNumber.getSttusCd())){
 				apvCnt++;
 			}else if(StringUtils.equals(Const.SNDRNO_STTUS_CD_REJECT, updateApprSendNumber.getSttusCd())){
 				rejtCnt++;