From 5d36e1f987ef21e44ded2e8a1d06c28094ec1e76 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期六, 19 四月 2025 12:39:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhitan-admin/src/main/java/com/zhitan/web/controller/model/EnergyIndexController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/model/EnergyIndexController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/model/EnergyIndexController.java
index d5a6610..7a2cc00 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/model/EnergyIndexController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/model/EnergyIndexController.java
@@ -141,7 +141,7 @@
List<ModelNodeIndexInfo> modelNodeIndexInfoList = energyIndexService.getModelNodeIndexInfoListByIndexIds(indexIds);
if (ObjectUtils.isNotEmpty(modelNodeIndexInfoList)) {
ModelNodeIndexInfo modelNodeIndexInfo = modelNodeIndexInfoList.stream().findFirst().get();
- return AjaxResult.error("鎸囨爣 " + modelNodeIndexInfo.getIndexName() + " 宸茶妯″瀷 " + modelNodeIndexInfo.getModelName() + " 鍏宠仈锛屼笉鑳藉垹闄わ紒");
+ return AjaxResult.error("閲囬泦鎸囨爣 " + modelNodeIndexInfo.getIndexName() + " 宸茶妯″瀷 " + modelNodeIndexInfo.getModelName() + " 鍏宠仈锛屼笉鑳藉垹闄わ紒");
}
energyIndexService.removeEnergyIndex(indexIdList);
@@ -164,8 +164,9 @@
// 鏌ヨ妯″瀷鑺傜偣鐐逛綅淇℃伅
List<ModelNodeIndexInfo> modelNodeIndexInfoList = energyIndexService.getModelNodeIndexInfoListByIndexIds(indexIds);
if (ObjectUtils.isNotEmpty(modelNodeIndexInfoList)) {
- ModelNodeIndexInfo modelNodeIndexInfo = modelNodeIndexInfoList.stream().findFirst().get();
- return AjaxResult.error("鎸囨爣 " + modelNodeIndexInfo.getIndexName() + " 宸茶妯″瀷 " + modelNodeIndexInfo.getModelName() + " 鍏宠仈锛屼笉鑳藉垹闄わ紒");
+ if(modelNodeIndexInfoList.size() > 1){
+ return AjaxResult.error("璇ョ粺璁℃寚鏍囧凡琚叾浠栨ā鍨嬪叧鑱旓紝涓嶈兘鍒犻櫎锛�");
+ }
}
energyIndexService.removeEnergyIndex(indexIdList);
--
Gitblit v1.9.3