From 11e27ddf54f5b4e2310591f74e8dd446e65a18ac Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 07 2월 2022 14:31:37 +0900
Subject: [PATCH] 이슈 엑셀 임포트시 상위이슈 null 체크 및 코드 보완
---
src/main/java/kr/wisestone/owl/web/controller/WorkflowController.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/controller/WorkflowController.java b/src/main/java/kr/wisestone/owl/web/controller/WorkflowController.java
index 1320cee..6fad2bd 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/WorkflowController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/WorkflowController.java
@@ -1,9 +1,12 @@
package kr.wisestone.owl.web.controller;
import kr.wisestone.owl.constant.Constants;
+import kr.wisestone.owl.service.DepartmentService;
+import kr.wisestone.owl.service.UserDepartmentService;
import kr.wisestone.owl.service.WorkflowService;
import kr.wisestone.owl.util.ConvertUtil;
import kr.wisestone.owl.vo.AttachedFileVo;
+import kr.wisestone.owl.web.condition.DepartmentCondition;
import kr.wisestone.owl.web.condition.WorkflowCondition;
import kr.wisestone.owl.web.form.WorkflowForm;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +33,9 @@
@Autowired
private WorkflowService workflowService;
+
+ @Autowired
+ private DepartmentService departmentService;
// �썙�겕�뵆濡쒖슦 �깮�꽦
@RequestMapping(value = "/workflow/add", produces = MediaType.APPLICATION_JSON_VALUE)
@@ -80,7 +86,6 @@
}
// �썙�겕�뵆濡쒖슦 �궘�젣
- @SuppressWarnings("unchecked")
@RequestMapping(value = "/workflow/remove", produces = MediaType.APPLICATION_JSON_VALUE)
public
@ResponseBody
@@ -97,4 +102,17 @@
public ModelAndView downloadExcel(HttpServletRequest request, Model model) {
return this.workflowService.downloadExcel(request, model);
}
+
+ // �썙�겕�뵆濡쒖슦 �떞�떦遺��꽌 媛��졇�삤湲�
+ @RequestMapping(value = "/workflow/findDepartments", produces = MediaType.APPLICATION_JSON_VALUE)
+ public
+ @ResponseBody
+ Map<String, Object> findDepartments(@RequestBody Map<String, Map<String, Object>> params) {
+ Map<String, Object> resJsonData = new HashMap<>();
+ Pageable pageable = this.pageUtil.convertPageable(this.getPageVo(params));
+
+ this.departmentService.find(resJsonData, DepartmentCondition.make(params.get(Constants.REQ_KEY_CONTENT)), pageable);
+
+ return this.setSuccessMessage(resJsonData);
+ }
}
--
Gitblit v1.8.0