diff --git a/frontend/src/modules/custMgt/components/TestIdRegPop.vue b/frontend/src/modules/custMgt/components/TestIdRegPop.vue
index f1f0baa..7630fe5 100644
--- a/frontend/src/modules/custMgt/components/TestIdRegPop.vue
+++ b/frontend/src/modules/custMgt/components/TestIdRegPop.vue
@@ -1,9 +1,9 @@
-
-
\ No newline at end of file
diff --git a/frontend/src/modules/custMgt/views/MemberAdminDetail.vue b/frontend/src/modules/custMgt/views/MemberAdminDetail.vue
index f7429a5..d0f1829 100644
--- a/frontend/src/modules/custMgt/views/MemberAdminDetail.vue
+++ b/frontend/src/modules/custMgt/views/MemberAdminDetail.vue
@@ -1,225 +1,249 @@
-
-
-
-
청약고객관리
-
고객관리 > 청약고객관리 > 회원관리
-
+
+
+
+
청약고객관리
+
고객관리 > 청약고객관리 > 회원관리
+
-
-
-
-
-
-
사용자ID 정보
-
( 최대 100개까지 등록 가능 )
-
-
- 사용자 ID 생성
- 사용자 ID 대량생성
- 삭제
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ 사용자ID 정보
+
( 최대 100개까지 등록 가능 )
+
+
+ 사용자 ID 생성
+ 사용자 ID 대량생성
+ 삭제
+
+
+
-
-
- 취소
- 저장
-
+
+
+ 등록된 사용자 정보가 없습니다.
+
+
+
+
+
+
+ 취소
+ 저장
+
-
-
-
-
-
+
+
+
+
-
-
+
+
\ No newline at end of file
diff --git a/frontend/src/modules/riskMgt/components/IntrcpMsgDetail.vue b/frontend/src/modules/riskMgt/components/IntrcpMsgDetail.vue
index 82aea1a..40e1f5a 100644
--- a/frontend/src/modules/riskMgt/components/IntrcpMsgDetail.vue
+++ b/frontend/src/modules/riskMgt/components/IntrcpMsgDetail.vue
@@ -54,7 +54,8 @@
메모
-
+
차단여부
@@ -106,6 +107,7 @@ export default {
memo: '', // 메모
seqNo: '',
props: {},
+ maxByte: 2000,
}
},
created() {
@@ -323,6 +325,9 @@ export default {
}
return validText
},
+ memoLimitByte() {
+ this.memo = this.getLimitedByteText(this.memo, this.maxByte);
+ },
msgLimitByte(){
this.word = this.getLimitedByteText(this.word, 10);
}
diff --git a/frontend/src/modules/riskMgt/views/All.vue b/frontend/src/modules/riskMgt/views/All.vue
index 05d3d3a..1e6ef94 100644
--- a/frontend/src/modules/riskMgt/views/All.vue
+++ b/frontend/src/modules/riskMgt/views/All.vue
@@ -338,7 +338,11 @@ export default {
},
todayDate() {
this.startDate = new Date(+new Date() + 3240 * 10000).toISOString().split("T")[0];
- }
+ },
+ changePerPage: function () { // 페이지당 조회할 개수
+ this.grid.pagePerRows = this.perPageCnt;
+ // this.search(true);
+ },
},
beforeRouteLeave(to, from, next) {
diff --git a/frontend/src/modules/riskMgt/views/ZezNum.vue b/frontend/src/modules/riskMgt/views/ZezNum.vue
index 215bb73..54e0009 100644
--- a/frontend/src/modules/riskMgt/views/ZezNum.vue
+++ b/frontend/src/modules/riskMgt/views/ZezNum.vue
@@ -200,7 +200,6 @@ export default {
},
changePerPage: function () { // 페이지당 조회할 개수
this.grid.pagePerRows = this.perPageCnt;
- this.search(true);
},
sendStoreData: function () {
const getP = this.$refs.table.getPagination();
diff --git a/frontend/src/modules/sendNumMgt/components/NumberRegPop.vue b/frontend/src/modules/sendNumMgt/components/NumberRegPop.vue
index dc25db9..d85a01c 100644
--- a/frontend/src/modules/sendNumMgt/components/NumberRegPop.vue
+++ b/frontend/src/modules/sendNumMgt/components/NumberRegPop.vue
@@ -253,8 +253,7 @@ export default {
},
// 위임-수임
readTrustFile(event) {
- const file = event.target.files[0];
- console.log(file.name);
+ const file = event.target.files[0];
if(this.fileExtCheck(file)) {
if (file != null) {
@@ -428,7 +427,7 @@ export default {
const root = document.getElementById('communicationNm');
root.appendChild(text);
root.appendChild(button);
- this.communicationFile = file;
+ this.communicationFile = file;
}
},
delCommunicationFile(event) {
@@ -492,9 +491,10 @@ export default {
// 사업자
const response = await sendNumMgtApi.insertNumber1(this.tenureFile, this.businessFile, this.communicationFile, this.adminId, this.custNm, this.bRegNo, this.nmineeDivCd, this.saveSendNums, this.bizrAuthYn, this.custSeq, this.bRegNo)
const result = response.data;
- console.log(result)
+
if (result != null && result.retCode == "0000") {
- if(result.data.list.length > 0){
+ alert(499);
+ if(result.data.list != null && result.data.list.length > 0){
this.row.title = '발신번호 등록';
var failMsg = "";
for(var i=0; i 0){
+ }else if(result != null && result.retCode == "4021") {
+ if(result.data.list != null && result.data.list.length > 0){
this.row.title = '발신번호 등록';
var failMsg = "";
for(var i=0; i 0){
- this.row.title = '발신번호 등록';
- var failMsg = "";
- for(var i=0; i"
+ const response = await sendNumMgtApi.insertNumber2(this.trustFile, this.communicationFile, this.warrantFile, this.deputyFile, this.tenureFile, this.otherBusinessFile, this.businessFile, this.adminId, this.custNm, this.bRegNo, this.nmineeDivCd, this.saveSendNums, this.bizrAuthYn, this.custSeq, this.bRegNo)
+
+ const result = response.data;
+ if (result != null && result.retCode == "0000") {
+ if(result.data.list != null){
+ if(result.data.list.length > 0){
+ this.row.title = '발신번호 등록';
+ var failMsg = "";
+ for(var i=0; i"
+ }
+ this.row.failMsg = failMsg
+ this.$parent.$refs.commmonModal.sendNumFailMsgOpen(this.row);
}
- this.row.failMsg = failMsg
- this.$parent.$refs.commmonModal.sendNumFailMsgOpen(this.row);
}
this.toComplete()
- }else if(result != null && result.retCode == "4021") {
- if(result.data.list.length > 0){
- this.row.title = '발신번호 등록';
- var failMsg = "";
- for(var i=0; i"
+ }else if(result != null && result.retCode == "4021") {
+ if(result.data.list != null){
+ if(result.data.list.length > 0){
+ this.row.title = '발신번호 등록';
+ var failMsg = "";
+ for(var i=0; i"
+ }
+ this.row.failMsg = failMsg
+ this.$parent.$refs.commmonModal.sendNumFailMsgOpen(this.row);
}
- this.row.failMsg = failMsg
- this.$parent.$refs.commmonModal.sendNumFailMsgOpen(this.row);
}
return false;
}
@@ -548,10 +552,10 @@ export default {
}
} else {
const response = await sendNumMgtApi.insertNumber(this.adminId, this.custNm, this.bRegNo, this.nmineeDivCd, this.saveSendNums, this.bizrAuthYn, this.custSeq, this.bRegNo)
- const result = response.data;
- console.log(result)
+ const result = response.data;
if (result != null && result.retCode == "0000") {
- if(result.data.list.length > 0){
+ alert(562);
+ if(result.data.list != null && result.data.list.length > 0){
this.row.title = '발신번호 등록';
var failMsg = "";
for(var i=0; i"
@@ -655,9 +659,9 @@ export default {
}
return true;
},
- toComplete() {
- this.getParent('numberList').$refs.table.reloadData();
- this.numberRegPopClose();
+ toComplete() {
+ this.getParent('numberList').$refs.table.reloadData();
+ this.numberRegPopClose();
},
}
}
diff --git a/frontend/src/modules/sendNumMgt/service/sendNumMgtApi.js b/frontend/src/modules/sendNumMgt/service/sendNumMgtApi.js
index ead72b5..8c2a195 100644
--- a/frontend/src/modules/sendNumMgt/service/sendNumMgtApi.js
+++ b/frontend/src/modules/sendNumMgt/service/sendNumMgtApi.js
@@ -74,7 +74,7 @@ const insertNumber1 = (tenureFile, businessFile, communicationFile, adminId, cus
};
// 타사업자가 등록 요청.
-const insertNumber2 = (trustFile, warrantFile, deputyFile, tenureFile, otherBusinessFile, businessFile, adminId, custNm, bRegNo, nmineeDivCd, numberInputs, bizrAuthYn, custSeq) => {
+const insertNumber2 = (trustFile, warrantFile, communicationFile, deputyFile, tenureFile, otherBusinessFile, businessFile, adminId, custNm, bRegNo, nmineeDivCd, numberInputs, bizrAuthYn, custSeq) => {
let formData = new FormData();
formData.append("trustFile", trustFile);
formData.append("warrantFile", warrantFile);
@@ -82,6 +82,7 @@ const insertNumber2 = (trustFile, warrantFile, deputyFile, tenureFile, otherBusi
formData.append("tenureFile", tenureFile);
formData.append("businessFile", businessFile);
formData.append("otherBusinessFile", otherBusinessFile);
+ formData.append("communicationFile", communicationFile);
const row = {}
row.adminId = adminId
diff --git a/frontend/src/modules/sendNumMgt/views/ProfileList.vue b/frontend/src/modules/sendNumMgt/views/ProfileList.vue
index b71ebf9..bb53393 100644
--- a/frontend/src/modules/sendNumMgt/views/ProfileList.vue
+++ b/frontend/src/modules/sendNumMgt/views/ProfileList.vue
@@ -28,7 +28,7 @@
검색어
+ maxlength="100" @keyup.enter="search"/>
조회
diff --git a/frontend/src/modules/sysMgt/components/AdminDetailPop.vue b/frontend/src/modules/sysMgt/components/AdminDetailPop.vue
index e13af88..5bcb468 100644
--- a/frontend/src/modules/sysMgt/components/AdminDetailPop.vue
+++ b/frontend/src/modules/sysMgt/components/AdminDetailPop.vue
@@ -1,9 +1,9 @@
-
+
-
\ No newline at end of file
diff --git a/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java b/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java
index d3b89d7..80240f2 100644
--- a/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java
+++ b/src/main/java/kr/co/uplus/ez/api/custMgt/CustMgtService.java
@@ -813,14 +813,14 @@ public class CustMgtService {
logger.debug("[Email Send Request - templeteCode : {}]", mailReqMap.get("templeteCode"));
logger.debug("[Email Send Request - homeUrl : {}]", mailReqMap.get("homeUrl"));
-// mailResultMap = hubeasyApi.sendTemplateMailApi(mailReqMap);
-//
-// if (mailResultMap != null) {
-// logger.debug("[Email Send API RESULT : {}]", mailResultMap.get("API_RSLT"));
-// if ("F".equals(mailResultMap.get("API_RSLT"))) {
-// logger.debug("[Email Send API ERROR : {}]", mailResultMap.get("API_RSLT_MSG"));
-// }
-// }
+ mailResultMap = hubeasyApi.sendTemplateMailApi(mailReqMap);
+
+ if (mailResultMap != null) {
+ logger.debug("[Email Send API RESULT : {}]", mailResultMap.get("API_RSLT"));
+ if ("F".equals(mailResultMap.get("API_RSLT"))) {
+ logger.debug("[Email Send API ERROR : {}]", mailResultMap.get("API_RSLT_MSG"));
+ }
+ }
logger.debug("############## [Email Send End] ###############");
} catch (Exception e) {
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 23b3fe7..5d1a864 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
@@ -440,6 +440,10 @@ public class SendNumMgtService {
SendNumMgtMapper sendNumMgtMapper = sqlSessionMaster.getMapper(SendNumMgtMapper.class);
+ Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+ UserDetails userDetails = (UserDetails) principal;
+ String regId = userDetails.getUsername();
+
// 발신번호 메모 업데이트. upddateSndrnoReg
int totalCnt = updateApprReqDto.getList().size();
int apvCnt = 0;
@@ -450,7 +454,7 @@ public class SendNumMgtService {
}else if(StringUtils.equals(Const.SNDRNO_STTUS_CD_REJECT, updateApprSendNumber.getSttusCd())){
rejtCnt++;
}
- updateApprSendNumber.setAdminId(updateApprReqDto.getAdminId());
+ updateApprSendNumber.setAdminId(regId);
sendNumMgtMapper.updateSndrno(updateApprSendNumber);
}
@@ -466,17 +470,6 @@ public class SendNumMgtService {
int result = sendNumMgtMapper.upddateSndrnoReg(updateApprReqDto);
- if(result > 0){
-
- }
-
- // 발신번호 상태 변경. updateSndrno
- //result = sendNumMgtMapper.updateSndrno(updateApprReqDto);
-
- if(result > 0){
-
- }
-
// 승인건이 1건이상이면 사업자 인증 'Y'
if(apvCnt > 0){
sendNumMgtMapper.updateSvcUser(updateApprReqDto);
diff --git a/src/main/resources/mapper/mysql/riskMgt/riskMgt-mapper.xml b/src/main/resources/mapper/mysql/riskMgt/riskMgt-mapper.xml
index 62f5892..378f727 100644
--- a/src/main/resources/mapper/mysql/riskMgt/riskMgt-mapper.xml
+++ b/src/main/resources/mapper/mysql/riskMgt/riskMgt-mapper.xml
@@ -388,7 +388,7 @@
SELECT
@ROWNUM := @ROWNUM + 1 AS NO
, A.SEQ_NO
- , A.BLCK_TP_CD
+ ,(SELECT ecd.DTL_CD_NM FROM hubez_common.EZ_CD_DTL ecd WHERE ecd.GRP_CD = 'WEBBLCK_TP_CD' AND DTL_CD = A.BLCK_TP_CD) AS BLCK_TP_CD
, A.CUST_SEQ
, A.USER_SEQ
, A.USER_ID