From 68eeeeefbfada4b297fc04aac28a7562f35b40bb Mon Sep 17 00:00:00 2001 From: jazz Date: Tue, 16 Dec 2025 16:00:33 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=EC=98=A4=EB=A5=98=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../store/mbrgrad/controller/MaMbrgradController.java | 2 +- .../domain/admin/store/mbrgrad/vo/BOMaMbrgradVO.java | 2 ++ .../admin/sys/ctgry/controller/MaCtgryController.java | 1 - .../domain/admin/sys/ctgry/vo/BOMaCtgryVO.java | 4 ++-- src/main/resources/static/ckeditor/uploadAdapter.js | 7 ++++--- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/wb/domainserver/domain/admin/store/mbrgrad/controller/MaMbrgradController.java b/src/main/java/com/wb/domainserver/domain/admin/store/mbrgrad/controller/MaMbrgradController.java index f81ce2c7..b056299c 100644 --- a/src/main/java/com/wb/domainserver/domain/admin/store/mbrgrad/controller/MaMbrgradController.java +++ b/src/main/java/com/wb/domainserver/domain/admin/store/mbrgrad/controller/MaMbrgradController.java @@ -133,7 +133,7 @@ public class MaMbrgradController { srchData.put("maMbrGradVO", vo); srchData.put("mbrGradInfo", mbrGradInfo); - model.addAttribute("resultMap", mbrGradInfo); + model.addAttribute("resultMap", srchData); // responseHandler.handleResponse( // sendToResrc.ofPost(RESRC.GCONEBO, "/admin/store/mbrgrad/selectBOMbrGradUpdtForm", vo), // model, diff --git a/src/main/java/com/wb/domainserver/domain/admin/store/mbrgrad/vo/BOMaMbrgradVO.java b/src/main/java/com/wb/domainserver/domain/admin/store/mbrgrad/vo/BOMaMbrgradVO.java index 05556eb5..baa28828 100644 --- a/src/main/java/com/wb/domainserver/domain/admin/store/mbrgrad/vo/BOMaMbrgradVO.java +++ b/src/main/java/com/wb/domainserver/domain/admin/store/mbrgrad/vo/BOMaMbrgradVO.java @@ -97,4 +97,6 @@ public class BOMaMbrgradVO extends AbstractVO { /*서버구분*/ private String serverDv; private String pageDv; + + private String srchCalcCndDvCds; } diff --git a/src/main/java/com/wb/domainserver/domain/admin/sys/ctgry/controller/MaCtgryController.java b/src/main/java/com/wb/domainserver/domain/admin/sys/ctgry/controller/MaCtgryController.java index b9b13321..b6c37099 100644 --- a/src/main/java/com/wb/domainserver/domain/admin/sys/ctgry/controller/MaCtgryController.java +++ b/src/main/java/com/wb/domainserver/domain/admin/sys/ctgry/controller/MaCtgryController.java @@ -126,7 +126,6 @@ public class MaCtgryController { @RequestMapping(value = "/updateCtgryUpdt", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) public ResponseEntity updateCtgryUpdt(BOMaCtgryVO vo, HttpServletRequest request) { - request.setAttribute("shopCd", vo.getSopmalCd()); request.setAttribute("pathGubun", "ETCM"); request.setAttribute("subPathId", ""); diff --git a/src/main/java/com/wb/domainserver/domain/admin/sys/ctgry/vo/BOMaCtgryVO.java b/src/main/java/com/wb/domainserver/domain/admin/sys/ctgry/vo/BOMaCtgryVO.java index c9273375..c554e95b 100644 --- a/src/main/java/com/wb/domainserver/domain/admin/sys/ctgry/vo/BOMaCtgryVO.java +++ b/src/main/java/com/wb/domainserver/domain/admin/sys/ctgry/vo/BOMaCtgryVO.java @@ -40,9 +40,9 @@ public class BOMaCtgryVO extends AbstractVO { /** 노출구분 */ private String expsrCd; /** 노출구분 시작일자 */ - private java.sql.Timestamp expsrBgnDt; + private String expsrBgnDt; /** 노출구분 종료자 */ - private java.sql.Timestamp expsrEndDt; + private String expsrEndDt; /** url 자동여부 */ private String urlDvCd; /** url */ diff --git a/src/main/resources/static/ckeditor/uploadAdapter.js b/src/main/resources/static/ckeditor/uploadAdapter.js index 02ef6817..57c8b273 100644 --- a/src/main/resources/static/ckeditor/uploadAdapter.js +++ b/src/main/resources/static/ckeditor/uploadAdapter.js @@ -1,6 +1,7 @@ class UploadAdapter { - constructor(loader) { + constructor(loader, url) { this.loader = loader; + this.url = url; } upload() { @@ -13,7 +14,7 @@ class UploadAdapter { _initRequest() { const xhr = this.xhr = new XMLHttpRequest(); - xhr.open('POST', '/comm/ckeditor/image/fileUpload', true); + xhr.open('POST', this.url, true); xhr.responseType = 'json'; } @@ -43,5 +44,5 @@ class UploadAdapter { } } function getDownloadUrl(item) { - return encodeURI(`${API_ROOT_URL}/download/images/${item.linkId}`); + return encodeURI(`${API_ROOT_URL}/download/images/${item.linkId}`); }