From 9754a0716d3c5227d2351c5b279908afb0ea130f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 23 十一月 2022 17:29:16 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java b/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java
index 3cb4d0f..1aeab86 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/portal/UmsWebsitePortalController.java
@@ -22,6 +22,7 @@
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -41,12 +42,14 @@
@ApiOperation("logo绠＄悊-娣诲姞logo")
@PostMapping("/logo/add")
+ @LogSave(operationType = "闂ㄦ埛绠＄悊", contain = "娣诲姞logo")
public CommonResult addLogo(@RequestBody @Validated WebsiteLogo websiteLogo) {
return CommonResult.success(umsWebsiteLogoService.save(websiteLogo));
}
@ApiOperation("logo绠＄悊-淇敼logo")
@PutMapping("/logo/update")
+ @LogSave(operationType = "闂ㄦ埛绠＄悊", contain = "淇敼logo")
public CommonResult updateLogo(@RequestBody WebsiteLogo websiteLogo) {
return CommonResult.success(umsWebsiteLogoService.updateById(websiteLogo));
}
@@ -65,6 +68,7 @@
@ApiOperation("logo绠＄悊-鍒犻櫎logo")
@DeleteMapping("/logo/delete")
+ @LogSave(operationType = "闂ㄦ埛绠＄悊", contain = "鍒犻櫎logo")
public CommonResult removeLogo(@RequestParam Integer id) {
return CommonResult.success(umsWebsiteLogoService.removeById(id));
}
@@ -112,11 +116,15 @@
@GetMapping("/menu/search_myself")
public CommonResult searchMenusMyself() {
AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
- return CommonResult.success(umsMenuService.ListTreeMyself(user.getUserId()));
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("menu",umsMenuService.ListTreeMyself(user.getUserId()));
+ map.put("permission",umsMenuService.getPermission(user.getUserId()));
+ return CommonResult.success(map);
}
@ApiOperation("鑿滃崟鏉冮檺-涓汉鑿滃崟鐘舵�佷慨鏀�")
@PutMapping("/menu/modification_myself")
+ @LogSave(operationType = "闂ㄦ埛绠＄悊", contain = "鑿滃崟鏉冮檺淇敼")
public CommonResult modifyMenusMyself(@RequestParam Long relationId, Integer status) {
AdminMenuRelation adminMenuRelation = new AdminMenuRelation();
adminMenuRelation.setId(relationId);
--
Gitblit v1.8.0