From 4c5c8ef02eaf9ee984a683eba73dcc49f5f8b476 Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 21 Nov 2024 14:35:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E9=94=80=E4=B8=AD=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/ysk/cashier/controller/AppCenterController.java    | 8 ++++++--
 .../service/impl/TbPlatformDictTypeServiceImpl.java       | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/controller/AppCenterController.java b/eladmin-system/src/main/java/cn/ysk/cashier/controller/AppCenterController.java
index 716887ea..8b2f4b8b 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/controller/AppCenterController.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/controller/AppCenterController.java
@@ -4,10 +4,12 @@ import cn.ysk.cashier.service.TbPlatformDictService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequiredArgsConstructor
@@ -19,10 +21,12 @@ public class AppCenterController {
 
     @GetMapping
     @ApiOperation("获取应用中心列表")
-    public ResponseEntity<Object> queryBotButtonConfig(){
-        return new ResponseEntity<>(tbPlatformDictService.queryByType("appCenter"), HttpStatus.OK);
+    public ResponseEntity<Object> queryBotButtonConfig(@RequestParam(required = false, defaultValue = "appCenter")  String type){
+        return new ResponseEntity<>(tbPlatformDictService.queryByType(type), HttpStatus.OK);
     }
 
 
 
+
+
 }
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPlatformDictTypeServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPlatformDictTypeServiceImpl.java
index cb4b64be..452d993d 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPlatformDictTypeServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/TbPlatformDictTypeServiceImpl.java
@@ -9,6 +9,7 @@ import cn.ysk.cashier.utils.ValidationUtil;
 import lombok.RequiredArgsConstructor;
 import cn.ysk.cashier.repository.TbPlatformDictTypeRepository;
 import cn.ysk.cashier.service.TbPlatformDictTypeService;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.data.domain.Page;
@@ -31,6 +32,7 @@ public class TbPlatformDictTypeServiceImpl implements TbPlatformDictTypeService
 
     @Override
     public Map<String,Object> queryAll(TbPlatformDictTypeQueryCriteria criteria, Pageable pageable){
+        pageable = PageRequest.of(0,50);
         Page<TbPlatformDictType> page = tbPlatformDictTypeRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
         return PageUtil.toPage(page.map(tbPlatformDictTypeMapper::toDto));
     }