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/service/impl/OsPvolumesServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPvolumesServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPvolumesServiceImpl.java
index 2bfe725..8d20ea9 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPvolumesServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPvolumesServiceImpl.java
@@ -38,8 +38,8 @@
/**
* 鍒嗛〉鏌ヨ鍗�
- * @param pageSize 椤垫暟
- * @param pageIndex 绗嚑椤�
+ * @param pageSize 绗嚑椤�
+ * @param pageIndex 椤垫暟
* @return 鍒嗛〉鏁版嵁
*/
@Override
@@ -59,7 +59,7 @@
public BaseResult savePvolume(OsPvolumeDTO dto) throws PLException {
PvolumeInfo pvoInfo = new PvolumeInfo();
pvoInfo.service = dto.getService();
- pvoInfo.id = dto.getId();
+// pvoInfo.id = dto.getId();
pvoInfo.name = dto.getName();
pvoInfo.host = dto.getHost();
pvoInfo.isvalid = dto.isIsvalid();
@@ -127,11 +127,11 @@
* @return 鍒犻櫎缁撴灉
*/
@Override
- public BaseResult deletePvolume(String[] ids) throws PLException {
- if ( ids.length == 0){
+ public BaseResult deletePvolume(String ids) throws PLException {
+ if ( StringUtils.isBlank(ids)){
throw new PLException("500", new String[]{"璇烽�夋嫨鐩稿叧鏁版嵁锛侊紒"});
}
- for (String id : ids) {
+ for (String id : ids.split(",")) {
boolean isvalid = platformClientUtil.getFrameworkService().checkIsvalid(id);
if(isvalid) {
throw new PLException("500", new String[]{"閫夋嫨鏁版嵁涓洪閫夎矾寰勶紝涓嶈兘鍒犻櫎锛�"});
@@ -140,7 +140,7 @@
UserEntityInfo userInfo = new UserEntityInfo();
userInfo.setUserName(WebUtil.getCurrentUserId());
userInfo.setModules("com.vci.client.framework.systemConfig.volumn.PvolumePanel");
- boolean rs = platformClientUtil.getFrameworkService().deletePvolume(ids, userInfo);
+ boolean rs = platformClientUtil.getFrameworkService().deletePvolume(ids.split(","), userInfo);
if(!rs){
return BaseResult.fail("鍒犻櫎澶辫触锛�");
}
--
Gitblit v1.9.3