From ec9c7e5582d4c20c35e7c3016d64a2213e9f6a50 Mon Sep 17 00:00:00 2001 From: minhee <alsdldlfrl@gmail.com> Date: 화, 15 3월 2022 12:12:17 +0900 Subject: [PATCH] - 파트너 엑셀 임포트 시 이메일 정규식표현 검사하는 코드 제거 - 이슈 상세페이지 setHideCompleteIssue null 체크 - api로 이슈 추가 시 이슈유형에 업체가 설정되어있지 않는경우 메시지 추가 --- src/main/java/kr/wisestone/owl/web/controller/UserWorkspaceController.java | 27 +-------------------------- 1 files changed, 1 insertions(+), 26 deletions(-) diff --git a/src/main/java/kr/wisestone/owl/web/controller/UserWorkspaceController.java b/src/main/java/kr/wisestone/owl/web/controller/UserWorkspaceController.java index c226690..809cc3a 100644 --- a/src/main/java/kr/wisestone/owl/web/controller/UserWorkspaceController.java +++ b/src/main/java/kr/wisestone/owl/web/controller/UserWorkspaceController.java @@ -3,7 +3,6 @@ import kr.wisestone.owl.constant.Constants; import kr.wisestone.owl.service.UserWorkspaceService; import kr.wisestone.owl.web.condition.UserWorkspaceCondition; -import kr.wisestone.owl.web.form.ProjectForm; import kr.wisestone.owl.web.form.UserWorkspaceForm; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; @@ -26,31 +25,6 @@ @Autowired private UserWorkspaceService userWorkspaceService; - // �궗�슜�옄 �벑湲� 議고쉶 - @RequestMapping(value = "/userWorkspace/levelFind", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public - @ResponseBody - Map<String, Object> levelFind(@RequestBody Map<String, Map<String, Object>> params) { - Map<String, Object> resJsonData = new HashMap<>(); - Pageable pageable = this.pageUtil.convertPageable(this.getPageVo(params)); - - this.userWorkspaceService.findUserWorkspace(resJsonData, UserWorkspaceCondition.make(params.get(Constants.REQ_KEY_CONTENT)), pageable); - //this.userWorkspaceService.levelFind(resJsonData, UserWorkspaceCondition.make(params.get(Constants.REQ_KEY_CONTENT)), pageable); - return this.setSuccessMessage(resJsonData); - } - - // 遺��꽌 議고쉶 - @RequestMapping(value = "/userWorkspace/departmentFind", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) - public - @ResponseBody - Map<String, Object> departmentFind(@RequestBody Map<String, Map<String, Object>> params) { - Map<String, Object> resJsonData = new HashMap<>(); - Pageable pageable = this.pageUtil.convertPageable(this.getPageVo(params)); - - this.userWorkspaceService.findUserWorkspace(resJsonData, UserWorkspaceCondition.make(params.get(Constants.REQ_KEY_CONTENT)), pageable); - //this.userWorkspaceService.departmentFind(resJsonData, UserWorkspaceCondition.make(params.get(Constants.REQ_KEY_CONTENT)), pageable); - return this.setSuccessMessage(resJsonData); - } // �뾽臾닿났媛꾩뿉 李몄뿬�븯�뒗 �궗�슜�옄 議고쉶 @RequestMapping(value = "/userWorkspace/find", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE) @@ -76,4 +50,5 @@ return this.setSuccessMessage(resJsonData); } + } -- Gitblit v1.8.0