From 6a47d5b88a98acec1fb0cac8c184071577a64cd1 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 26 九月 2022 17:15:40 +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 | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 bd9238f..4240c35 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
@@ -1,6 +1,7 @@
package com.ycl.controller.portal;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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;
@@ -46,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")
@@ -63,9 +64,10 @@
@ApiOperation("鑷畾涔夎彍鍗�-鑿滃崟鏌ヨ")
@GetMapping("/menu/search")
- public CommonResult searchMenus() {
+ public CommonResult searchMenus(@RequestBody Page page) {
+ Page menus = umsMenuService.page(page, new QueryWrapper<UmsMenu>().eq("parent_id", 0));
List<UmsMenuVo> umsMenuVoList ;
- List<UmsMenu> firstMenu = umsMenuService.list(new QueryWrapper<UmsMenu>().eq("parent_id", 0));
+ List<UmsMenu> firstMenu = menus.getRecords();
umsMenuVoList = firstMenu.stream().map(item -> {
UmsMenuVo umsMenuVo = new UmsMenuVo();
BeanUtils.copyProperties(item, umsMenuVo);
@@ -95,7 +97,8 @@
item.setMenuVoArrayList(secondMenuListVos);
});
}
- return CommonResult.success(umsMenuVoList);
+ menus.setRecords(umsMenuVoList);
+ return CommonResult.success(menus);
}
@ApiOperation("鑷畾涔夎彍鍗�-娣诲姞鑿滃崟")
@@ -124,8 +127,8 @@
@ApiOperation("绗笁鏂规帴鍙ｇ鐞�-鏌ヨ")
@GetMapping("/thirdApp/search")
- public CommonResult searchThirdApp() {
- return CommonResult.success(umsThirdApplicationsService.list(new QueryWrapper<>()));
+ public CommonResult searchThirdApp(@RequestBody Page page) {
+ return CommonResult.success(umsThirdApplicationsService.page(page,new QueryWrapper<>()));
}
@ApiOperation("绗笁鏂规帴鍙ｇ鐞�-鏌ヨ閫氳繃id")
--
Gitblit v1.8.0