From 912ee45ea29637bfb8d9656bebab7304921d5cf6 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 13 May 2021 15:56:12 +0800
Subject: [PATCH] screen-manage 修改获取组织admin角色菜单接口 修改分配组织admin角色菜单接口
---
screen-manage/src/main/java/com/moral/api/controller/MenuController.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/controller/MenuController.java b/screen-manage/src/main/java/com/moral/api/controller/MenuController.java
index aef663a..2f657d1 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/MenuController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/MenuController.java
@@ -14,6 +14,7 @@
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
/**
@@ -35,8 +36,21 @@
@GetMapping("query")
public ResultMessage query() {
+
+ //������������admin���������������������������������������
+ MenuQueryDTO dto = menuService.queryAllMenus();
+
+ //���������������������������
+ MenuQueryVO vo = MenuQueryVO.convert(dto);
+
+ return new ResultMessage(dto.getCode(), dto.getMsg(), vo);
+ }
+
+ @GetMapping("queryAdmin")
+ public ResultMessage queryAdmin(@RequestParam Integer organizationId) {
+
//������������������
- MenuQueryDTO dto = menuService.queryAllMenu();
+ MenuQueryDTO dto = menuService.queryAdminGroupMenusByOrganizationId(organizationId);
//���������������������������
MenuQueryVO vo = MenuQueryVO.convert(dto);
@@ -45,7 +59,7 @@
}
@GetMapping("queryNames")
- public ResultMessage queryNames(MenuQueryNamesForm form){
+ public ResultMessage queryNames(MenuQueryNamesForm form) {
//������������������
MenuQueryNamesDTO dto = menuService.queryNames(form);
@@ -72,7 +86,7 @@
}
@PostMapping("delete")
- public ResultMessage delete(@RequestBody MenuDeleteForm form){
+ public ResultMessage delete(@RequestBody MenuDeleteForm form) {
//������������������������
if (!form.valid())
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
@@ -88,7 +102,7 @@
}
@PostMapping("update")
- public ResultMessage update(@RequestBody MenuUpdateForm form){
+ public ResultMessage update(@RequestBody MenuUpdateForm form) {
//������������������������
if (!form.valid())
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
--
Gitblit v1.8.0