From b2b9e785e10c8fd59c3fcee8c8fda2aeb86be8c3 Mon Sep 17 00:00:00 2001
From: 이민희 <mhlee@maprex.co.kr>
Date: 월, 27 12월 2021 13:34:22 +0900
Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa
---
src/main/java/kr/wisestone/owl/web/controller/UserLevelController.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/main/java/kr/wisestone/owl/web/controller/UserLevelController.java b/src/main/java/kr/wisestone/owl/web/controller/UserLevelController.java
index aaebf39..72f1499 100644
--- a/src/main/java/kr/wisestone/owl/web/controller/UserLevelController.java
+++ b/src/main/java/kr/wisestone/owl/web/controller/UserLevelController.java
@@ -1,14 +1,8 @@
package kr.wisestone.owl.web.controller;
import kr.wisestone.owl.constant.Constants;
-import kr.wisestone.owl.domain.enumType.SocialType;
import kr.wisestone.owl.service.UserLevelService;
-import kr.wisestone.owl.service.UserService;
-import kr.wisestone.owl.util.ConvertUtil;
-import kr.wisestone.owl.web.condition.NoticeCondition;
-import kr.wisestone.owl.web.condition.UserCondition;
import kr.wisestone.owl.web.condition.UserLevelCondition;
-import kr.wisestone.owl.web.form.UserForm;
import kr.wisestone.owl.web.form.UserLevelForm;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
@@ -16,7 +10,6 @@
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
@@ -24,7 +17,7 @@
import java.util.Map;
/**
- * Created by jeong on 2017-08-02.
+ * Created by jeong on 2021-11-05.
*/
@Controller
public class UserLevelController extends BaseController {
@@ -68,14 +61,26 @@
return this.setSuccessMessage(resJsonData);
}
+ // �궗�슜�옄�벑湲됰챸留� �닔�젙
+ @RequestMapping(value = "/userLevel/nameModify", produces = MediaType.APPLICATION_JSON_VALUE)
+ public
+ @ResponseBody
+ Map<String, Object> nameModify(@RequestBody Map<String, Map<String, Object>> params) {
+ Map<String, Object> resJsonData = new HashMap<>();
+
+ this.userLevelService.modifyLevelName(UserLevelForm.make(params.get(Constants.REQ_KEY_CONTENT)));
+
+ return this.setSuccessMessage(resJsonData);
+ }
+
// �궗�슜�옄�벑湲� �닔�젙
@RequestMapping(value = "/userLevel/modify", produces = MediaType.APPLICATION_JSON_VALUE)
public
@ResponseBody
Map<String, Object> modify(@RequestBody Map<String, Map<String, Object>> params) {
Map<String, Object> resJsonData = new HashMap<>();
- Map<String, Object> content = params.get(Constants.REQ_KEY_CONTENT);
- this.userLevelService.modifyUserLevel(UserLevelForm.make(content));
+
+ this.userLevelService.modifyLevelPermission(UserLevelForm.make(params.get(Constants.REQ_KEY_CONTENT)));
return this.setSuccessMessage(resJsonData);
}
@@ -100,6 +105,7 @@
return this.userLevelService.downloadExcel(request, model);
}
+
/*// �씠踰ㅽ듃 �떦泥⑥옄 �뿊�� �떎�슫濡쒕뱶
@RequestMapping(value = "/user/downloadExcelEvent", method = RequestMethod.POST)
public ModelAndView downloadExcelEvent(HttpServletRequest request, Model model) {
--
Gitblit v1.8.0