From 33b2b3a0e697e1bdb804a37de800b0471dfb0cef Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 28 九月 2022 20:28:55 +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 | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 068c8a4..d8a7d90 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
@@ -4,12 +4,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.api.CommonResult;
import com.ycl.entity.portal.ThirdApplications;
-import com.ycl.entity.user.UmsMenu;
import com.ycl.entity.portal.WebsiteLogo;
+import com.ycl.entity.user.UmsMenu;
import com.ycl.entity.user.vo.UmsMenuVo;
import com.ycl.service.portal.UmsThirdApplicationsService;
-import com.ycl.service.user.UmsMenuService;
import com.ycl.service.portal.UmsWebsiteLogoService;
+import com.ycl.service.user.UmsMenuService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
@@ -47,7 +47,7 @@
@ApiOperation("logo绠＄悊-鏌ヨlogo")
@GetMapping("/logo/search")
public CommonResult searchLogo() {
- return CommonResult.success(umsWebsiteLogoService.list(new QueryWrapper<>()));
+ return CommonResult.success(umsWebsiteLogoService.list(new QueryWrapper<>()).get(0));
}
@ApiOperation("logo绠＄悊-鏌ヨlogo")
@@ -64,16 +64,16 @@
@ApiOperation("鑷畾涔夎彍鍗�-鑿滃崟鏌ヨ")
@GetMapping("/menu/search")
- public CommonResult searchMenus(@RequestBody Page page) {
+ public CommonResult searchMenus(Page page) {
Page menus = umsMenuService.page(page, new QueryWrapper<UmsMenu>().eq("parent_id", 0));
- List<UmsMenuVo> umsMenuVoList ;
+ List<UmsMenuVo> umsMenuVoList;
List<UmsMenu> firstMenu = menus.getRecords();
- umsMenuVoList = firstMenu.stream().map(item -> {
+ umsMenuVoList = firstMenu.stream().map(item -> {
UmsMenuVo umsMenuVo = new UmsMenuVo();
BeanUtils.copyProperties(item, umsMenuVo);
return umsMenuVo;
}).collect(Collectors.toList());
- if (firstMenu.size()!=0){
+ if (firstMenu.size() != 0) {
umsMenuVoList.forEach(item -> {
List<UmsMenuVo> secondMenuListVos;
List<UmsMenu> secondMenuList = umsMenuService.list(new QueryWrapper<UmsMenu>().eq("parent_id", item.getId()));
@@ -104,7 +104,7 @@
@ApiOperation("鑷畾涔夎彍鍗�-娣诲姞鑿滃崟")
@PostMapping("/menu/add")
public CommonResult addMenu(@RequestBody UmsMenu umsMenu) {
- return CommonResult.success(umsMenuService.save(umsMenu));
+ return CommonResult.success(umsMenuService.save(umsMenu));
}
@ApiOperation("鑷畾涔夎彍鍗�-淇敼鑿滃崟")
@@ -127,8 +127,8 @@
@ApiOperation("绗笁鏂规帴鍙ｇ鐞�-鏌ヨ")
@GetMapping("/thirdApp/search")
- public CommonResult searchThirdApp(@RequestBody Page page) {
- return CommonResult.success(umsThirdApplicationsService.page(page,new QueryWrapper<>()));
+ public CommonResult searchThirdApp(Page page) {
+ return CommonResult.success(umsThirdApplicationsService.page(page, new QueryWrapper<>()));
}
@ApiOperation("绗笁鏂规帴鍙ｇ鐞�-鏌ヨ閫氳繃id")
--
Gitblit v1.8.0