From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResPowerStationServiceImpl.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResPowerStationServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResPowerStationServiceImpl.java
index fd363f0..98cd7a9 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResPowerStationServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbAttResPowerStationServiceImpl.java
@@ -97,6 +97,7 @@
boolean updateFlag = true;
boolean removeFlag = true;
if (addList.size()>0){
+ //如果是中途管理员编辑新增了一个，将状态设置为和原有的状态一致
// 批量新增
addFlag = saveBatch(addList);
}
@@ -222,10 +223,8 @@
if (newTbAttResPowerStation.getCheckState()==4){
fillName = "编辑";
// 找到相关的 guid 数据
- for (TbAttResPowerStation tbAttResPowerStation : oldList) {
- if (tbAttResPowerStation.getGuid().equals(newTbAttResPowerStation.getGuid())){
- newTbAttResPowerStation.setCheckState(tbAttResPowerStation.getCheckState());
- }
+ if (oldList.size()>0) {
+ newTbAttResPowerStation.setCheckState(oldList.get(0).getCheckState());
}
}
--
Gitblit v1.9.3