From 69dbc35a84b948acc2166aef6876c300da03f2c6 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 24 十月 2024 16:18:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsPvolumesController.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsPvolumesController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsPvolumesController.java
index 7fff70c..e103888 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsPvolumesController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsPvolumesController.java
@@ -39,14 +39,20 @@
/**
* 鍒嗛〉鏌ヨ鍗�
- * @param pageSize 椤垫暟
- * @param pageIndex 绗嚑椤�
+ * @param pageSize 绗嚑椤�
+ * @param pageIndex 椤垫暟
* @return 鍒嗛〉鏁版嵁
*/
@GetMapping("/getPvolumesPage")
- public BaseResult getPvolumesPage(short pageSize, short pageIndex){
+ public BaseResult getPvolumesPage(Integer pageSize, Integer pageIndex){
try {
- return osPvolumesServiceI.getPvolumesPage(pageSize, pageIndex);
+ if(pageIndex == null){
+ pageIndex = 1000 ;
+ }
+ if(pageSize == null){
+ pageSize = 0;
+ }
+ return osPvolumesServiceI.getPvolumesPage(pageSize.shortValue(), pageIndex.shortValue());
} catch (PLException e) {
BaseResult objectBaseResult = new BaseResult<>();
objectBaseResult.setCode(Integer.parseInt(e.code));
@@ -95,7 +101,7 @@
* @return 鍒犻櫎缁撴灉
*/
@DeleteMapping("/deletePvolume")
- public BaseResult deletePvolume(String[] ids){
+ public BaseResult deletePvolume(String ids){
try {
return osPvolumesServiceI.deletePvolume(ids);
} catch (PLException e) {
--
Gitblit v1.9.3